Revert "Build imagick for PHP 8.3 (#2394)"

This reverts commit af00599148.
2025-04-19 18:36:09 +02:00 · 2025-04-11 03:26:40 +02:00 · 2025-04-11 03:26:40 +02:00 · ee8b638c11
commit ee8b638c11
parent 88ef913597
13 changed files with 17 additions and 194 deletions
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:8.2-apache-bookworm

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
 FROM php:8.2-fpm-alpine3.21

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -65,23 +62,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:8.2-fpm-bookworm

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:8.2-apache-bookworm

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
 FROM php:8.2-fpm-alpine3.21

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -65,23 +62,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:8.2-fpm-bookworm

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@ -1,8 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.3-apache-bookworm
-
-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
+FROM php:8.2-apache-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@ -1,8 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.3-fpm-alpine3.21
-
-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
+FROM php:8.2-fpm-alpine3.21

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -65,23 +62,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@ -1,8 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.3-fpm-bookworm
-
-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
+FROM php:8.2-fpm-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.7.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -1,8 +1,5 @@
 FROM php:%%PHP_VERSION%%-%%VARIANT%%%%ALPINE_VERSION%%

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -64,23 +61,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-%%APCU_VERSION%%; \
    pecl install igbinary-%%IGBINARY_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
    pecl install memcached-%%MEMCACHED_VERSION%% \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-%%REDIS_VERSION%% \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -1,8 +1,5 @@
 FROM php:%%PHP_VERSION%%-%%VARIANT%%-%%DEBIAN_VERSION%%

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -67,23 +64,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-%%APCU_VERSION%%; \
    pecl install igbinary-%%IGBINARY_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
    pecl install memcached-%%MEMCACHED_VERSION%% \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-%%REDIS_VERSION%% \
--- a/update.sh
+++ b/update.sh
@ -11,7 +11,6 @@ declare -A debian_version=(

 declare -A php_version=(
 	[default]='8.2'
-	[31]='8.3'
 )

 declare -A cmd=(
--- a/versions.json
+++ b/versions.json
@ -9,19 +9,19 @@
        "variant": "apache",
        "base": "debian",
        "baseVersion": "bookworm",
-        "phpVersion": "8.3"
+        "phpVersion": "8.2"
      },
      "fpm": {
        "variant": "fpm",
        "base": "debian",
        "baseVersion": "bookworm",
-        "phpVersion": "8.3"
+        "phpVersion": "8.2"
      },
      "fpm-alpine": {
        "variant": "fpm-alpine",
        "base": "alpine",
        "baseVersion": "3.21",
-        "phpVersion": "8.3"
+        "phpVersion": "8.2"
      }
    }
  },