Lock to phing 2

mageops · Sep 10, 2024 · d3ca28a · d3ca28a
1 parent 0ff6324
commit d3ca28a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -118,6 +118,8 @@ RUN rpm --import https://rpms.remirepo.net/RPM-GPG-KEY-remi \
 ENV COMPOSER_HOME="/opt/composer"
 ARG COMPOSER_VERSION="1"
 ENV COMPOSER_VERSION="${COMPOSER_VERSION}"
+ARG PHING_VERSION="2"
+ENV PHING_VERSION="${PHING_VERSION}"
 
 RUN mkdir /opt/composer \
   && curl getcomposer.org/installer -o /tmp/composer-setup \
@@ -126,7 +128,7 @@ RUN mkdir /opt/composer \
   && php /tmp/composer-setup "--${COMPOSER_VERSION}" --install-dir=/usr/bin --filename=composer \
   && rm /tmp/composer-setup \
   && composer global config bin-dir /usr/bin \
-  && composer global require phing/phing \
+  && composer global require phing/phing "^${PHING_VERSION}" \
   && if [ "$COMPOSER_VERSION" = "1" ];then composer global require hirak/prestissimo; fi \
   && curl -L https://github.com/nicolas-van/multirun/releases/download/0.3.2/multirun-glibc-0.3.2.tar.gz | tar -xz -C /sbin \
   && chmod +x /sbin/multirun \

diff --git a/README.md b/README.md
@@ -31,11 +31,12 @@ See [all tags](https://github.com/mageops/docker-magento-run-tests/pkgs/containe
 - `stable` - latest tag named `vX.Y`
 
 ## Notable versions
-| --- | --- | ---: | ---: | ---: | ---: |
-| **rl9-php80-es7-mysql80** | _rl9-php80-es7-mysql80-stable_ | 8.0.X | Mysql 8.0 | 7.17.3 | 2 |
-| **rl9-php81-es7-mysql80** | _rl9-php81-es7-mysql80-stable_ | 8.1.X | Mysql 8.0 | 7.17.3 | 2 |
-| **rl9-php82-es84-mysql80** | _rl9-php82-es84-mysql80-stable_ | 8.2.X | Mysql 8.0 | 8.4.3 | 2 |
-| **rl9-php83-es811-mysql80** | _rl9-php83-es811-mysql80-stable_ | 8.3.X | Mysql 8.0 | 8.11.4 | 2 |
+| Version | Docker tag | PHP | DB| Elasticsearch | Composer version | Phing version |
+| --- | --- | ---: | ---: | ---: | ---: | ---: |
+| **rl9-php80-es7-mysql80-phing2** | _rl9-php80-es7-mysql80-phing2-stable_ | 8.0.X | Mysql 8.0 | 7.17.3 | 2 | 2 |
+| **rl9-php81-es7-mysql80-phing2** | _rl9-php81-es7-mysql80-phing2-stable_ | 8.1.X | Mysql 8.0 | 7.17.3 | 2 | 2 |
+| **rl9-php82-es84-mysql80-phing2** | _rl9-php82-es84-mysql80-phing2-stable_ | 8.2.X | Mysql 8.0 | 8.4.3 | 2 | 2 |
+| **rl9-php83-es811-mysql80-phing2** | _rl9-php83-es811-mysql80-phing2-stable_ | 8.3.X | Mysql 8.0 | 8.11.4 | 2 | 2 |
 
 _Note: The `exec` mount opt on `/tmp` is needed for elasticsearch because it maps mem to temp files._
 _The image is big and there's not really a way around it since it has a lot of software and is based on RockyLinux (which we use for local dev / production deployments, so we want to keep everything else close)._

diff --git a/hooks/variants b/hooks/variants
@@ -23,15 +23,15 @@ if [[ ! -z "$DOCKER_BUILD_CACHE_FROM" ]] ; then
 fi
 
 IMAGE_VARIANTS=(
-    'VARIANT_NAME="rl9-php80-es7-mysql80"     ; PHP_VERSION="8.0" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MYSQL_VERSION="8.0"     ; COMPOSER_VERSION=2  ; MYSQL_FLAVOR=mysql'
-    'VARIANT_NAME="rl9-php81-es7-mysql80"     ; PHP_VERSION="8.1" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MYSQL_VERSION="8.0"     ; COMPOSER_VERSION=2  ; MYSQL_FLAVOR=mysql'
-    'VARIANT_NAME="rl9-php82-es84-mysql80"     ; PHP_VERSION="8.2" ; ELASTICSEARCH_VERSION="8.4.3-x86_64" ; MYSQL_VERSION="8.0"     ; COMPOSER_VERSION=2  ; MYSQL_FLAVOR=mysql'
-    'VARIANT_NAME="rl9-php83-es811-mysql80"     ; PHP_VERSION="8.3" ; ELASTICSEARCH_VERSION="8.11.4-x86_64" ; MYSQL_VERSION="8.0"     ; COMPOSER_VERSION=2  ; MYSQL_FLAVOR=mysql'
+    'VARIANT_NAME="rl9-php80-es7-mysql80-phing2"     ; PHP_VERSION="8.0" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MYSQL_VERSION="8.0"     ; COMPOSER_VERSION=2  ; MYSQL_FLAVOR=mysql ; PHING_VERSION=2'
+    'VARIANT_NAME="rl9-php81-es7-mysql80-phing2"     ; PHP_VERSION="8.1" ; ELASTICSEARCH_VERSION="7.17.3-x86_64" ; MYSQL_VERSION="8.0"     ; COMPOSER_VERSION=2  ; MYSQL_FLAVOR=mysql ; PHING_VERSION=2'
+    'VARIANT_NAME="rl9-php82-es84-mysql80-phing2"    ; PHP_VERSION="8.2" ; ELASTICSEARCH_VERSION="8.4.3-x86_64"  ; MYSQL_VERSION="8.0"     ; COMPOSER_VERSION=2  ; MYSQL_FLAVOR=mysql ; PHING_VERSION=2'
+    'VARIANT_NAME="rl9-php83-es811-mysql80-phing2"   ; PHP_VERSION="8.3" ; ELASTICSEARCH_VERSION="8.11.4-x86_64" ; MYSQL_VERSION="8.0"     ; COMPOSER_VERSION=2  ; MYSQL_FLAVOR=mysql ; PHING_VERSION=2'
 )
 
 function generate_table() {
-    echo "| Version | Docker tag | PHP | DB| Elasticsearch | Composer version |"
-    echo "| --- | --- | ---: | ---: | ---: | ---: |"
+    echo "| Version | Docker tag | PHP | DB| Elasticsearch | Composer version | Phing version |"
+    echo "| --- | --- | ---: | ---: | ---: | ---: | ---: |"
     for VARIANT_DATA in "${IMAGE_VARIANTS[@]}" ; do
         (
             eval "$VARIANT_DATA";
@@ -40,7 +40,7 @@ function generate_table() {
             else
                 MYSQL_DESC="MariaDB ${MARIADB_VERSION}"
             fi
-            echo "| **${VARIANT_NAME}** | _${VARIANT_NAME}-stable_ | ${PHP_VERSION}.X | ${MYSQL_DESC} | ${ELASTICSEARCH_VERSION/-x86_64/} | ${COMPOSER_VERSION} |"
+            echo "| **${VARIANT_NAME}** | _${VARIANT_NAME}-stable_ | ${PHP_VERSION}.X | ${MYSQL_DESC} | ${ELASTICSEARCH_VERSION/-x86_64/} | ${COMPOSER_VERSION} | ${PHING_VERSION} |"
         )
     done
 }
@@ -97,7 +97,8 @@ function build_variants() {
                 --build-arg MARIADB_VERSION="${MARIADB_VERSION:-}" \
                 --build-arg MYSQL_VERSION="${MYSQL_VERSION:-}" \
                 --build-arg MYSQL_FLAVOR="${MYSQL_FLAVOR:-mariadb}" \
-                --build-arg COMPOSER_VERSION="$COMPOSER_VERSION"
+                --build-arg COMPOSER_VERSION="$COMPOSER_VERSION" \
+                --build-arg PHING_VERSION="$PHING_VERSION" \
         )
     done
 }