From 456aae4b12a807dd89dfde3659f612f305bd8aa4 Mon Sep 17 00:00:00 2001
From: le0m <mainardi.leo@gmail.com>
Date: Wed, 27 Nov 2024 14:07:07 +0100
Subject: [PATCH] fix: let mlocati/docker-php-extension-installer handle
 imagick installation for php 8.3 and 8.4

---
 Dockerfile        | 6 +-----
 Dockerfile.alpine | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 440425c..cae8d9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,6 +29,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \
       exif \
       gd \
       gettext \
+      imagick \
       intl \
       ldap \
       memcached \
@@ -47,11 +48,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \
       5.6.*) PHP_EXTENSIONS="$PHP_EXTENSIONS mcrypt mysql";; \
       7.0.*|7.1.*) PHP_EXTENSIONS="$PHP_EXTENSIONS mcrypt";; \
     esac \
-    # Install Imagick from master on PHP >= 8.3, because imagick 3.7.0 broke on latest PHP releases and Imagick maintainers don't care to tag a newer release
-    && if [ $(php -r 'echo PHP_VERSION_ID;') -lt 80300 ]; then \
-      PHP_EXTENSIONS="$PHP_EXTENSIONS imagick"; \
-      else PHP_EXTENSIONS="$PHP_EXTENSIONS https://api.github.com/repos/Imagick/imagick/tarball/28f27044e435a2b203e32675e942eb8de620ee58"; \
-    fi \
     && install-php-extensions $PHP_EXTENSIONS \
     && if command -v a2enmod; then a2enmod rewrite; fi
 
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 804a911..9fddb5c 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -21,6 +21,7 @@ RUN apk add --no-cache \
       exif \
       gd \
       gettext \
+      imagick \
       intl \
       ldap \
       memcached \
@@ -39,11 +40,6 @@ RUN apk add --no-cache \
       5.6.*) PHP_EXTENSIONS="$PHP_EXTENSIONS mcrypt mysql";; \
       7.0.*|7.1.*) PHP_EXTENSIONS="$PHP_EXTENSIONS mcrypt";; \
     esac \
-    # Install Imagick from master on PHP >= 8.3, because imagick 3.7.0 broke on latest PHP releases and Imagick maintainers don't care to tag a newer release
-    && if [ $(php -r 'echo PHP_VERSION_ID;') -lt 80300 ]; then \
-      PHP_EXTENSIONS="$PHP_EXTENSIONS imagick"; \
-      else PHP_EXTENSIONS="$PHP_EXTENSIONS https://api.github.com/repos/Imagick/imagick/tarball/28f27044e435a2b203e32675e942eb8de620ee58"; \
-    fi \
     && install-php-extensions $PHP_EXTENSIONS \
     && if command -v a2enmod; then a2enmod rewrite; fi