Add PHP 8.5 support

mvorisek · Sep 25, 2024 · f9d46c6 · f9d46c6
1 parent 55e3f1b
commit f9d46c6
Show file tree

Hide file tree

Showing 21 changed files with 814 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,6 +50,9 @@ jobs:
           - "8.4-alpine"
           - "8.4-zts-alpine"
           - "8.4-debug-alpine"
+          - "8.5-alpine"
+          - "8.5-zts-alpine"
+          - "8.5-debug-alpine"
           - "7.4-debian"
           - "7.4-zts-debian"
           - "7.4-debug-debian"
@@ -68,6 +71,9 @@ jobs:
           - "8.4-debian"
           - "8.4-zts-debian"
           - "8.4-debug-debian"
+          - "8.5-debian"
+          - "8.5-zts-debian"
+          - "8.5-debug-debian"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -367,7 +373,7 @@ jobs:
         if: (matrix.imageName == '8.4-alpine' || matrix.imageName == '8.4-zts-alpine' || matrix.imageName == '8.4-debug-alpine' || matrix.imageName == '8.4-debian' || matrix.imageName == '8.4-zts-debian' || matrix.imageName == '8.4-debug-debian')
         run: >-
           if [ "${{ matrix.imageName }}" == "8.4-alpine" ] || [ "${{ matrix.imageName }}" == "8.4-zts-alpine" ] || [ "${{ matrix.imageName }}" == "8.4-debug-alpine" ] || [ "${{ matrix.imageName }}" == "8.4-debian" ] || [ "${{ matrix.imageName }}" == "8.4-zts-debian" ] || [ "${{ matrix.imageName }}" == "8.4-debug-debian" ]; then
-          export PHPSRC_BRANCH="$(git ls-remote 'https://github.com/php/php-src.git' | grep -iE '\srefs/heads/master$' | sort -k2 -V | tee /dev/stderr | awk 'END{print $NF}' | sed -E 's~^refs/[^/]+/~~')"
+          export PHPSRC_BRANCH="$(git ls-remote 'https://github.com/php/php-src.git' | grep -iE '\srefs/tags/PHP-8\.4\.[0-9]+$' | sort -k2 -V | tee /dev/stderr | awk 'END{print $NF}' | sed -E 's~^refs/[^/]+/~~')"
           ; fi
           && if [ "${{ matrix.imageName }}" == "8.4-alpine" ] || [ "${{ matrix.imageName }}" == "8.4-zts-alpine" ] || [ "${{ matrix.imageName }}" == "8.4-debug-alpine" ] || [ "${{ matrix.imageName }}" == "8.4-debian" ] || [ "${{ matrix.imageName }}" == "8.4-zts-debian" ] || [ "${{ matrix.imageName }}" == "8.4-debug-debian" ]; then
           git clone --depth 1 'https://github.com/php/php-src.git' -b "$PHPSRC_BRANCH" phpsrc
@@ -418,6 +424,61 @@ jobs:
           && true
           && git add . -N && git diff --diff-filter=d
 
+      - name: 'Build base image - clone & patch - 8.5.x'
+        if: (matrix.imageName == '8.5-alpine' || matrix.imageName == '8.5-zts-alpine' || matrix.imageName == '8.5-debug-alpine' || matrix.imageName == '8.5-debian' || matrix.imageName == '8.5-zts-debian' || matrix.imageName == '8.5-debug-debian')
+        run: >-
+          if [ "${{ matrix.imageName }}" == "8.5-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-zts-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debug-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debian" ] || [ "${{ matrix.imageName }}" == "8.5-zts-debian" ] || [ "${{ matrix.imageName }}" == "8.5-debug-debian" ]; then
+          export PHPSRC_BRANCH="$(git ls-remote 'https://github.com/php/php-src.git' | grep -iE '\srefs/heads/master$' | sort -k2 -V | tee /dev/stderr | awk 'END{print $NF}' | sed -E 's~^refs/[^/]+/~~')"
+          ; fi
+          && if [ "${{ matrix.imageName }}" == "8.5-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-zts-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debug-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debian" ] || [ "${{ matrix.imageName }}" == "8.5-zts-debian" ] || [ "${{ matrix.imageName }}" == "8.5-debug-debian" ]; then
+          git clone --depth 1 'https://github.com/php/php-src.git' -b "$PHPSRC_BRANCH" phpsrc
+          ; fi
+          && cd phpsrc && export PHPSRC_COMMIT="$(git rev-parse HEAD)"
+          && git checkout -B master
+          && true
+          && sudo apt-get -y update && sudo apt-get -y install bison re2c
+          && scripts/dev/makedist > /dev/null && mv php-master-*.tar.xz php.tar.xz
+          && git add . -N && git diff --diff-filter=d "$PHPSRC_COMMIT"
+          && cd ..
+          && git clone https://github.com/docker-library/php.git dlphp && cd dlphp
+          && true
+          && rm -r [0-9].[0-9]*/ && sed -E 's~( // )error\("missing GPG keys for " \+ env\.version\)~\1["x"]~' -i Dockerfile-linux.template
+          && if [ "${{ matrix.imageName }}" == "8.5-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debug-alpine" ]; then
+          echo '{ "8.3": { "url": "x", "variants": [ "alpine3.19/cli" ], "version": "8.3.99" } }' > versions.json
+          ; elif [ "${{ matrix.imageName }}" == "8.5-zts-alpine" ]; then
+          echo '{ "8.3": { "url": "x", "variants": [ "alpine3.19/zts" ], "version": "8.3.99" } }' > versions.json
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debian" ] || [ "${{ matrix.imageName }}" == "8.5-debug-debian" ]; then
+          echo '{ "8.3": { "url": "x", "variants": [ "bookworm/cli" ], "version": "8.3.99" } }' > versions.json
+          ; elif [ "${{ matrix.imageName }}" == "8.5-zts-debian" ]; then
+          echo '{ "8.3": { "url": "x", "variants": [ "bookworm/zts" ], "version": "8.3.99" } }' > versions.json
+          ; fi
+          && true
+          && if [ "${{ matrix.imageName }}" == "8.5-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-zts-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debian" ] || [ "${{ matrix.imageName }}" == "8.5-zts-debian" ]; then
+          ./apply-templates.sh
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debug-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debug-debian" ]; then
+          DOCKER_PHP_ENABLE_DEBUG=1 ./apply-templates.sh
+          ; fi
+          && if [ "${{ matrix.imageName }}" == "8.5-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debug-alpine" ]; then
+          mv 8.3/alpine3.19/cli/ img
+          ; elif [ "${{ matrix.imageName }}" == "8.5-zts-alpine" ]; then
+          mv 8.3/alpine3.19/zts/ img
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debian" ] || [ "${{ matrix.imageName }}" == "8.5-debug-debian" ]; then
+          mv 8.3/bookworm/cli/ img
+          ; elif [ "${{ matrix.imageName }}" == "8.5-zts-debian" ]; then
+          mv 8.3/bookworm/zts/ img
+          ; fi
+          && cd img && mv ../../phpsrc/php.tar.xz .
+          && sed -E 's~^(ENV PHP_VERSION[ =]).*~\1CUSTOM--'"$PHPSRC_BRANCH--$PHPSRC_COMMIT"'~' -i Dockerfile
+          && sed -E 's~^(ENV PHP_URL[ =]).*~COPY php.tar.xz /usr/src/~' -i Dockerfile
+          && sed -E 's~^(ENV (GPG_KEYS|PHP_URL|PHP_ASC_URL|PHP_SHA256)[ =]).*~~' -i Dockerfile
+          && sed -E 's~-n "\$(PHP_SHA256|PHP_ASC_URL)"~-n ""~' -i Dockerfile
+          && sed -E 's~curl -fsSL -o php.tar.xz .*; ~~' -i Dockerfile
+          && if [ "${{ matrix.imageName }}" == "8.5-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-zts-alpine" ] || [ "${{ matrix.imageName }}" == "8.5-debug-alpine" ]; then
+          sed -E 's~(--with-curl.*)( \\)~\1 --enable-embed\2~' -i Dockerfile
+          ; fi
+          && true
+          && git add . -N && git diff --diff-filter=d
+
       - name: 'Build base image - build - 7.4.x'
         if: (matrix.imageName == '7.4-alpine' || matrix.imageName == '7.4-zts-alpine' || matrix.imageName == '7.4-debug-alpine' || matrix.imageName == '7.4-debian' || matrix.imageName == '7.4-zts-debian' || matrix.imageName == '7.4-debug-debian')
         # try to build twice to suppress random network issues with Github Actions
@@ -640,6 +701,43 @@ jobs:
           || docker build --cache-from "php:8.3-cli-bookworm" --cache-from "$REGISTRY_IMAGE_NAME:8.4-debug-debian-base" -t "ci-target:base" ./)
           ; fi
 
+      - name: 'Build base image - build - 8.5.x'
+        if: (matrix.imageName == '8.5-alpine' || matrix.imageName == '8.5-zts-alpine' || matrix.imageName == '8.5-debug-alpine' || matrix.imageName == '8.5-debian' || matrix.imageName == '8.5-zts-debian' || matrix.imageName == '8.5-debug-debian')
+        # try to build twice to suppress random network issues with Github Actions
+        run: >-
+          cd dlphp/img
+          && if [ "${{ matrix.imageName }}" == "8.5-alpine" ]; then
+          ((docker pull "php:8.3-cli-alpine3.19" || docker pull "php:8.3-cli-alpine3.19") || true)
+          && ((docker pull "$REGISTRY_IMAGE_NAME:8.5-alpine-base" || docker pull "$REGISTRY_IMAGE_NAME:8.5-alpine-base") || true)
+          && (docker build --cache-from "php:8.3-cli-alpine3.19" --cache-from "$REGISTRY_IMAGE_NAME:8.5-alpine-base" -t "ci-target:base" ./
+          || docker build --cache-from "php:8.3-cli-alpine3.19" --cache-from "$REGISTRY_IMAGE_NAME:8.5-alpine-base" -t "ci-target:base" ./)
+          ; elif [ "${{ matrix.imageName }}" == "8.5-zts-alpine" ]; then
+          ((docker pull "php:8.3-zts-alpine3.19" || docker pull "php:8.3-zts-alpine3.19") || true)
+          && ((docker pull "$REGISTRY_IMAGE_NAME:8.5-zts-alpine-base" || docker pull "$REGISTRY_IMAGE_NAME:8.5-zts-alpine-base") || true)
+          && (docker build --cache-from "php:8.3-zts-alpine3.19" --cache-from "$REGISTRY_IMAGE_NAME:8.5-zts-alpine-base" -t "ci-target:base" ./
+          || docker build --cache-from "php:8.3-zts-alpine3.19" --cache-from "$REGISTRY_IMAGE_NAME:8.5-zts-alpine-base" -t "ci-target:base" ./)
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debug-alpine" ]; then
+          ((docker pull "php:8.3-cli-alpine3.19" || docker pull "php:8.3-cli-alpine3.19") || true)
+          && ((docker pull "$REGISTRY_IMAGE_NAME:8.5-debug-alpine-base" || docker pull "$REGISTRY_IMAGE_NAME:8.5-debug-alpine-base") || true)
+          && (docker build --cache-from "php:8.3-cli-alpine3.19" --cache-from "$REGISTRY_IMAGE_NAME:8.5-debug-alpine-base" -t "ci-target:base" ./
+          || docker build --cache-from "php:8.3-cli-alpine3.19" --cache-from "$REGISTRY_IMAGE_NAME:8.5-debug-alpine-base" -t "ci-target:base" ./)
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debian" ]; then
+          ((docker pull "php:8.3-cli-bookworm" || docker pull "php:8.3-cli-bookworm") || true)
+          && ((docker pull "$REGISTRY_IMAGE_NAME:8.5-debian-base" || docker pull "$REGISTRY_IMAGE_NAME:8.5-debian-base") || true)
+          && (docker build --cache-from "php:8.3-cli-bookworm" --cache-from "$REGISTRY_IMAGE_NAME:8.5-debian-base" -t "ci-target:base" ./
+          || docker build --cache-from "php:8.3-cli-bookworm" --cache-from "$REGISTRY_IMAGE_NAME:8.5-debian-base" -t "ci-target:base" ./)
+          ; elif [ "${{ matrix.imageName }}" == "8.5-zts-debian" ]; then
+          ((docker pull "php:8.3-zts-bookworm" || docker pull "php:8.3-zts-bookworm") || true)
+          && ((docker pull "$REGISTRY_IMAGE_NAME:8.5-zts-debian-base" || docker pull "$REGISTRY_IMAGE_NAME:8.5-zts-debian-base") || true)
+          && (docker build --cache-from "php:8.3-zts-bookworm" --cache-from "$REGISTRY_IMAGE_NAME:8.5-zts-debian-base" -t "ci-target:base" ./
+          || docker build --cache-from "php:8.3-zts-bookworm" --cache-from "$REGISTRY_IMAGE_NAME:8.5-zts-debian-base" -t "ci-target:base" ./)
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debug-debian" ]; then
+          ((docker pull "php:8.3-cli-bookworm" || docker pull "php:8.3-cli-bookworm") || true)
+          && ((docker pull "$REGISTRY_IMAGE_NAME:8.5-debug-debian-base" || docker pull "$REGISTRY_IMAGE_NAME:8.5-debug-debian-base") || true)
+          && (docker build --cache-from "php:8.3-cli-bookworm" --cache-from "$REGISTRY_IMAGE_NAME:8.5-debug-debian-base" -t "ci-target:base" ./
+          || docker build --cache-from "php:8.3-cli-bookworm" --cache-from "$REGISTRY_IMAGE_NAME:8.5-debug-debian-base" -t "ci-target:base" ./)
+          ; fi
+
       - name: 'Target "basic" - build'
         # try to build twice to suppress random network issues with Github Actions
         run: >-
@@ -1027,3 +1125,51 @@ jobs:
           && dtp "node" "8.4-debug-debian-node"
           && dtp "selenium" "8.4-debug-debian-selenium"
           ; fi
+
+      - name: 'Push tags to registry - 8.5.x'
+        if: (github.ref == 'refs/heads/master') && (matrix.imageName == '8.5-alpine' || matrix.imageName == '8.5-zts-alpine' || matrix.imageName == '8.5-debug-alpine' || matrix.imageName == '8.5-debian' || matrix.imageName == '8.5-zts-debian' || matrix.imageName == '8.5-debug-debian')
+        run: >-
+          dtp() { docker tag "ci-target:$1" "$REGISTRY_IMAGE_NAME:$2" && docker push "$REGISTRY_IMAGE_NAME:$2"; }
+          && if [ "${{ matrix.imageName }}" == "8.5-alpine" ]; then
+          dtp "base" "8.5-base"
+          && dtp "base" "8.5-alpine-base"
+          && dtp "basic" "8.5"
+          && dtp "basic" "8.5-alpine"
+          && dtp "node" "8.5-node"
+          && dtp "node" "8.5-alpine-node"
+          && dtp "selenium" "8.5-selenium"
+          && dtp "selenium" "8.5-alpine-selenium"
+          ; elif [ "${{ matrix.imageName }}" == "8.5-zts-alpine" ]; then
+          dtp "base" "8.5-zts-base"
+          && dtp "base" "8.5-zts-alpine-base"
+          && dtp "basic" "8.5-zts"
+          && dtp "basic" "8.5-zts-alpine"
+          && dtp "node" "8.5-zts-node"
+          && dtp "node" "8.5-zts-alpine-node"
+          && dtp "selenium" "8.5-zts-selenium"
+          && dtp "selenium" "8.5-zts-alpine-selenium"
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debug-alpine" ]; then
+          dtp "base" "8.5-debug-base"
+          && dtp "base" "8.5-debug-alpine-base"
+          && dtp "basic" "8.5-debug"
+          && dtp "basic" "8.5-debug-alpine"
+          && dtp "node" "8.5-debug-node"
+          && dtp "node" "8.5-debug-alpine-node"
+          && dtp "selenium" "8.5-debug-selenium"
+          && dtp "selenium" "8.5-debug-alpine-selenium"
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debian" ]; then
+          dtp "base" "8.5-debian-base"
+          && dtp "basic" "8.5-debian"
+          && dtp "node" "8.5-debian-node"
+          && dtp "selenium" "8.5-debian-selenium"
+          ; elif [ "${{ matrix.imageName }}" == "8.5-zts-debian" ]; then
+          dtp "base" "8.5-zts-debian-base"
+          && dtp "basic" "8.5-zts-debian"
+          && dtp "node" "8.5-zts-debian-node"
+          && dtp "selenium" "8.5-zts-debian-selenium"
+          ; elif [ "${{ matrix.imageName }}" == "8.5-debug-debian" ]; then
+          dtp "base" "8.5-debug-debian-base"
+          && dtp "basic" "8.5-debug-debian"
+          && dtp "node" "8.5-debug-debian-node"
+          && dtp "selenium" "8.5-debug-debian-selenium"
+          ; fi
diff --git a/README.md b/README.md
@@ -22,6 +22,9 @@ This repository builds `ghcr.io/mvorisek/image-php` image and publishes the foll
 - `8.4` `8.4-alpine`
 - `8.4-zts` `8.4-zts-alpine`
 - `8.4-debug` `8.4-debug-alpine`
+- `8.5` `8.5-alpine`
+- `8.5-zts` `8.5-zts-alpine`
+- `8.5-debug` `8.5-debug-alpine`
 - `7.4-debian`
 - `7.4-zts-debian`
 - `7.4-debug-debian`
@@ -40,6 +43,9 @@ This repository builds `ghcr.io/mvorisek/image-php` image and publishes the foll
 - `8.4-debian`
 - `8.4-zts-debian`
 - `8.4-debug-debian`
+- `8.5-debian`
+- `8.5-zts-debian`
+- `8.5-debug-debian`
 - `7.4-node` `7.4-alpine-node`
 - `7.4-zts-node` `7.4-zts-alpine-node`
 - `7.4-debug-node` `7.4-debug-alpine-node`
@@ -58,6 +64,9 @@ This repository builds `ghcr.io/mvorisek/image-php` image and publishes the foll
 - `8.4-node` `8.4-alpine-node`
 - `8.4-zts-node` `8.4-zts-alpine-node`
 - `8.4-debug-node` `8.4-debug-alpine-node`
+- `8.5-node` `8.5-alpine-node`
+- `8.5-zts-node` `8.5-zts-alpine-node`
+- `8.5-debug-node` `8.5-debug-alpine-node`
 - `7.4-debian-node`
 - `7.4-zts-debian-node`
 - `7.4-debug-debian-node`
@@ -76,6 +85,9 @@ This repository builds `ghcr.io/mvorisek/image-php` image and publishes the foll
 - `8.4-debian-node`
 - `8.4-zts-debian-node`
 - `8.4-debug-debian-node`
+- `8.5-debian-node`
+- `8.5-zts-debian-node`
+- `8.5-debug-debian-node`
 - `7.4-selenium` `7.4-alpine-selenium`
 - `7.4-zts-selenium` `7.4-zts-alpine-selenium`
 - `7.4-debug-selenium` `7.4-debug-alpine-selenium`
@@ -94,6 +106,9 @@ This repository builds `ghcr.io/mvorisek/image-php` image and publishes the foll
 - `8.4-selenium` `8.4-alpine-selenium`
 - `8.4-zts-selenium` `8.4-zts-alpine-selenium`
 - `8.4-debug-selenium` `8.4-debug-alpine-selenium`
+- `8.5-selenium` `8.5-alpine-selenium`
+- `8.5-zts-selenium` `8.5-zts-alpine-selenium`
+- `8.5-debug-selenium` `8.5-debug-alpine-selenium`
 - `7.4-debian-selenium`
 - `7.4-zts-debian-selenium`
 - `7.4-debug-debian-selenium`
@@ -112,6 +127,9 @@ This repository builds `ghcr.io/mvorisek/image-php` image and publishes the foll
 - `8.4-debian-selenium`
 - `8.4-zts-debian-selenium`
 - `8.4-debug-debian-selenium`
+- `8.5-debian-selenium`
+- `8.5-zts-debian-selenium`
+- `8.5-debug-debian-selenium`
 
 ## Running Locally
 

diff --git a/data/8.3-alpine/Dockerfile b/data/8.3-alpine/Dockerfile
@@ -18,7 +18,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     imap \
     intl \
     mysqli \

diff --git a/data/8.3-debian/Dockerfile b/data/8.3-debian/Dockerfile
@@ -19,7 +19,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     imap \
     intl \
     mysqli \

diff --git a/data/8.3-debug-alpine/Dockerfile b/data/8.3-debug-alpine/Dockerfile
@@ -18,7 +18,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     imap \
     intl \
     mysqli \

diff --git a/data/8.3-debug-debian/Dockerfile b/data/8.3-debug-debian/Dockerfile
@@ -19,7 +19,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     imap \
     intl \
     mysqli \

diff --git a/data/8.3-zts-alpine/Dockerfile b/data/8.3-zts-alpine/Dockerfile
@@ -18,7 +18,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     imap \
     intl \
     mysqli \

diff --git a/data/8.3-zts-debian/Dockerfile b/data/8.3-zts-debian/Dockerfile
@@ -19,7 +19,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     imap \
     intl \
     mysqli \

diff --git a/data/8.4-alpine/Dockerfile b/data/8.4-alpine/Dockerfile
@@ -23,7 +23,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     php/pecl-mail-imap@25b62dbf7b \
     intl \
     mysqli \
@@ -62,7 +62,7 @@ RUN ! readelf -S /usr/local/bin/php | grep -q ' \.symtab ' \
     && ! readelf -S "$(find /usr/local/lib/php/extensions -name bcmath.so)" | grep -q ' \.symtab ' \
     && ! readelf -S "$(find /usr/local/lib/php/extensions -name xdebug.so)" | grep -q ' \.symtab '
 RUN composer diagnose
-RUN mkdir t && (cd t && echo '{}' > composer.json && composer config platform.php 8.3 && composer require phpunit/phpunit) && rm -r t/
+RUN mkdir t && (cd t && composer require phpunit/phpunit) && rm -r t/
 
 
 FROM basic as node

diff --git a/data/8.4-debian/Dockerfile b/data/8.4-debian/Dockerfile
@@ -24,7 +24,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     php/pecl-mail-imap@25b62dbf7b \
     intl \
     mysqli \
@@ -61,7 +61,7 @@ RUN ! readelf -S /usr/local/bin/php | grep -q ' \.symtab ' \
     && ! readelf -S "$(find /usr/local/lib/php/extensions -name bcmath.so)" | grep -q ' \.symtab ' \
     && ! readelf -S "$(find /usr/local/lib/php/extensions -name xdebug.so)" | grep -q ' \.symtab '
 RUN composer diagnose
-RUN mkdir t && (cd t && echo '{}' > composer.json && composer config platform.php 8.3 && composer require phpunit/phpunit) && rm -r t/
+RUN mkdir t && (cd t && composer require phpunit/phpunit) && rm -r t/
 
 
 FROM basic as node

diff --git a/data/8.4-debug-alpine/Dockerfile b/data/8.4-debug-alpine/Dockerfile
@@ -23,7 +23,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     gd \
     gmp \
     igbinary \
-    Imagick/imagick@ef495c0b8f \
+    Imagick/imagick@65e27f2bc0 \
     php/pecl-mail-imap@25b62dbf7b \
     intl \
     mysqli \
@@ -62,7 +62,7 @@ RUN readelf -S /usr/local/bin/php | grep -q ' \.symtab ' \
     && readelf -S "$(find /usr/local/lib/php/extensions -name bcmath.so)" | grep -q ' \.symtab ' \
     && readelf -S "$(find /usr/local/lib/php/extensions -name xdebug.so)" | grep -q ' \.symtab '
 RUN composer diagnose
-RUN mkdir t && (cd t && echo '{}' > composer.json && composer config platform.php 8.3 && composer require phpunit/phpunit) && rm -r t/
+RUN mkdir t && (cd t && composer require phpunit/phpunit) && rm -r t/
 
 
 FROM basic as node