Merge pull request #49 from webvisum/main

Update releases, make deployer a global cli
OpenMage · Aug 15, 2023 · c958f91 · c958f91
2 parents a174949 + c73213e
commit c958f91
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 23 deletions.
diff --git a/.github/workflows/php-7.4.yml b/.github/workflows/php-7.4.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         version: [7.4]
-        patchVersion: [28,29,30,32,33]
+        patchVersion: [29,30,32,33]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/php-8.0.yml b/.github/workflows/php-8.0.yml
@@ -11,13 +11,12 @@ on:
     - cron:  '00 5 * * 1'
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         version: ['8.0']
-        patchVersion: [24,25,26,27,28]
+        patchVersion: [25,26,27,28,29]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/php-8.1.yml b/.github/workflows/php-8.1.yml
@@ -11,13 +11,12 @@ on:
     - cron:  '00 6 * * 1'
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         version: ['8.1']
-        patchVersion: [15,16,17,18,19]
+        patchVersion: [17,18,19,20,21]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/php-8.2.yml b/.github/workflows/php-8.2.yml
@@ -11,13 +11,12 @@ on:
     - cron:  '00 7 * * 1'
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         version: ['8.2']
-        patchVersion: [2,3,4,5,6]
+        patchVersion: [3,4,5,6,7]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -8,7 +8,7 @@ jobs:
   lint:
     strategy:
       matrix:
-        version: ['7.4', '8.0', '8.1']
+        version: ['7.4', '8.0', '8.1', '8.2']
     runs-on: ubuntu-latest
     container: pipelinecomponents/hadolint:latest
     steps:

diff --git a/src/7.4/src/Dockerfile b/src/7.4/src/Dockerfile
@@ -150,9 +150,7 @@ RUN set -xe; \
     ################################################
     curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \
     chmod +x /usr/local/bin/magerun2; \
-    /usr/local/bin/docker-layer-clean; \
-    echo "alias dep='vendor/bin/deployer.phar'" >> ~/.bashrc; \
-    echo "alias dep='vendor/bin/deployer.phar'" >> /home/www-data/.bashrc
+    /usr/local/bin/docker-layer-clean
 
 WORKDIR /var/www/html
 ENTRYPOINT ["docker-entrypoint"]
@@ -166,6 +164,12 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
+RUN set -xe; \
+    \
+    composer global require deployer/deployer; \
+    composer global update; \
+    echo "export PATH=$PATH:~/.composer/vendor/bin" >> ~/.bashrc && source ~/.bashrc
+
 # hadolint ignore=DL4006
 RUN set -xe; \
     \

diff --git a/src/8.0/src/Dockerfile b/src/8.0/src/Dockerfile
@@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary"
 ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
 ARG PHP_CONFIGURE_ARGS_EXTRA=""
 ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data"
-ARG PHP_VERSION="8.0.28"
+ARG PHP_VERSION="8.0.29"
 
 ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
     PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
@@ -150,9 +150,7 @@ RUN set -xe; \
     ################################################
     curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \
     chmod +x /usr/local/bin/magerun2; \
-    /usr/local/bin/docker-layer-clean; \
-    echo "alias dep='vendor/bin/deployer.phar'" >> ~/.bashrc; \
-    echo "alias dep='vendor/bin/deployer.phar'" >> /home/www-data/.bashrc
+    /usr/local/bin/docker-layer-clean
 
 WORKDIR /var/www/html
 ENTRYPOINT ["docker-entrypoint"]
@@ -166,6 +164,12 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
+RUN set -xe; \
+    \
+    composer global require deployer/deployer; \
+    composer global update; \
+    echo "export PATH=$PATH:~/.composer/vendor/bin" >> ~/.bashrc && source ~/.bashrc
+
 # hadolint ignore=DL4006
 RUN set -xe; \
     \

diff --git a/src/8.1/src/Dockerfile b/src/8.1/src/Dockerfile
@@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary"
 ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
 ARG PHP_CONFIGURE_ARGS_EXTRA=""
 ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data"
-ARG PHP_VERSION="8.1.19"
+ARG PHP_VERSION="8.1.21"
 
 ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
     PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
@@ -150,9 +150,7 @@ RUN set -xe; \
     ################################################
     curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \
     chmod +x /usr/local/bin/magerun2; \
-    /usr/local/bin/docker-layer-clean; \
-    echo "alias dep='vendor/bin/deployer.phar'" >> ~/.bashrc; \
-    echo "alias dep='vendor/bin/deployer.phar'" >> /home/www-data/.bashrc
+    /usr/local/bin/docker-layer-clean
 
 WORKDIR /var/www/html
 ENTRYPOINT ["docker-entrypoint"]
@@ -166,6 +164,12 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
+RUN set -xe; \
+    \
+    composer global require deployer/deployer; \
+    composer global update; \
+    echo "export PATH=$PATH:~/.composer/vendor/bin" >> ~/.bashrc && source ~/.bashrc
+
 # hadolint ignore=DL4006
 RUN set -xe; \
     \

diff --git a/src/8.2/src/Dockerfile b/src/8.2/src/Dockerfile
@@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary"
 ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl"
 ARG PHP_CONFIGURE_ARGS_EXTRA=""
 ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data"
-ARG PHP_VERSION="8.2.6"
+ARG PHP_VERSION="8.2.7"
 
 ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
     PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
@@ -150,9 +150,7 @@ RUN set -xe; \
     ################################################
     curl -s -f -L -o /usr/local/bin/magerun2 https://files.magerun.net/n98-magerun2.phar; \
     chmod +x /usr/local/bin/magerun2; \
-    /usr/local/bin/docker-layer-clean; \
-    echo "alias dep='vendor/bin/deployer.phar'" >> ~/.bashrc; \
-    echo "alias dep='vendor/bin/deployer.phar'" >> /home/www-data/.bashrc
+    /usr/local/bin/docker-layer-clean
 
 WORKDIR /var/www/html
 ENTRYPOINT ["docker-entrypoint"]
@@ -166,6 +164,12 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
+RUN set -xe; \
+    \
+    composer global require deployer/deployer; \
+    composer global update; \
+    echo "export PATH=$PATH:~/.composer/vendor/bin" >> ~/.bashrc && source ~/.bashrc
+
 # hadolint ignore=DL4006
 RUN set -xe; \
     \