From a8ced12c810e2af77d130b9d521125f4fef3d569 Mon Sep 17 00:00:00 2001 From: Justin Lamp Date: Thu, 14 Jul 2022 14:04:09 +0200 Subject: [PATCH 1/3] Include imagick in all flavours Signed-off-by: Justin Lamp --- 23/apache/Dockerfile | 1 + 23/fpm-alpine/Dockerfile | 1 + 23/fpm/Dockerfile | 1 + 24/apache/Dockerfile | 1 + 24/fpm-alpine/Dockerfile | 1 + 24/fpm/Dockerfile | 1 + 25/apache/Dockerfile | 1 + 25/fpm-alpine/Dockerfile | 1 + 25/fpm/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 11 files changed, 11 insertions(+) diff --git a/23/apache/Dockerfile b/23/apache/Dockerfile index a08d14ccd..eb774dc3c 100644 --- a/23/apache/Dockerfile +++ b/23/apache/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex; \ bzip2 \ busybox-static \ libldap-common \ + libmagickcore-6.q16-6-extra \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/23/fpm-alpine/Dockerfile b/23/fpm-alpine/Dockerfile index 98ced82bc..d07bf7408 100644 --- a/23/fpm-alpine/Dockerfile +++ b/23/fpm-alpine/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ + php7-pecl-imagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/23/fpm/Dockerfile b/23/fpm/Dockerfile index caed34941..198da7e14 100644 --- a/23/fpm/Dockerfile +++ b/23/fpm/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex; \ bzip2 \ busybox-static \ libldap-common \ + libmagickcore-6.q16-6-extra \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile index 89752e76e..b0a5fa2c0 100644 --- a/24/apache/Dockerfile +++ b/24/apache/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex; \ bzip2 \ busybox-static \ libldap-common \ + libmagickcore-6.q16-6-extra \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile index 3eba47c29..2c01e4b72 100644 --- a/24/fpm-alpine/Dockerfile +++ b/24/fpm-alpine/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ + php7-pecl-imagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile index c19bd006a..01d50bfa3 100644 --- a/24/fpm/Dockerfile +++ b/24/fpm/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex; \ bzip2 \ busybox-static \ libldap-common \ + libmagickcore-6.q16-6-extra \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile index bef15bf22..accae666d 100644 --- a/25/apache/Dockerfile +++ b/25/apache/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex; \ bzip2 \ busybox-static \ libldap-common \ + libmagickcore-6.q16-6-extra \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile index 7ba4bbda7..80efeeca9 100644 --- a/25/fpm-alpine/Dockerfile +++ b/25/fpm-alpine/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ + php7-pecl-imagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile index 8d1ae0690..34a7a1ab0 100644 --- a/25/fpm/Dockerfile +++ b/25/fpm/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex; \ bzip2 \ busybox-static \ libldap-common \ + libmagickcore-6.q16-6-extra \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 411460022..06895048e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -5,6 +5,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ + php7-pecl-imagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index a13f0e27b..4d2e60447 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -9,6 +9,7 @@ RUN set -ex; \ bzip2 \ busybox-static \ libldap-common \ + libmagickcore-6.q16-6-extra \ ; \ rm -rf /var/lib/apt/lists/*; \ \ From 1df395ca15fe2ab7d377d9a6e7d5f2d9a70b0639 Mon Sep 17 00:00:00 2001 From: Justin Lamp Date: Fri, 15 Jul 2022 15:25:50 +0200 Subject: [PATCH 2/3] Fix alpine imagick version Signed-off-by: Justin Lamp --- 23/fpm-alpine/Dockerfile | 2 +- 24/fpm-alpine/Dockerfile | 2 +- 25/fpm-alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/23/fpm-alpine/Dockerfile b/23/fpm-alpine/Dockerfile index d07bf7408..fb2b449ae 100644 --- a/23/fpm-alpine/Dockerfile +++ b/23/fpm-alpine/Dockerfile @@ -6,7 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ - php7-pecl-imagick \ + php8-pecl-imagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile index 2c01e4b72..70b3a6351 100644 --- a/24/fpm-alpine/Dockerfile +++ b/24/fpm-alpine/Dockerfile @@ -6,7 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ - php7-pecl-imagick \ + php8-pecl-imagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile index 80efeeca9..05a82ea07 100644 --- a/25/fpm-alpine/Dockerfile +++ b/25/fpm-alpine/Dockerfile @@ -6,7 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ - php7-pecl-imagick \ + php8-pecl-imagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 06895048e..545191da6 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -5,7 +5,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ - php7-pecl-imagick \ + php8-pecl-imagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ From f46df02fe368b14ac1f1e22c68a5c4ada0ac75d6 Mon Sep 17 00:00:00 2001 From: modzilla99 Date: Sat, 16 Jul 2022 19:24:29 +0200 Subject: [PATCH 3/3] Changed alpine package to imagemagick php extension is already present, so only install imagemagick Signed-off-by: modzilla99 --- 23/fpm-alpine/Dockerfile | 2 +- 24/fpm-alpine/Dockerfile | 2 +- 25/fpm-alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/23/fpm-alpine/Dockerfile b/23/fpm-alpine/Dockerfile index fb2b449ae..2c2757c81 100644 --- a/23/fpm-alpine/Dockerfile +++ b/23/fpm-alpine/Dockerfile @@ -6,7 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ - php8-pecl-imagick \ + imagemagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile index 70b3a6351..124e28911 100644 --- a/24/fpm-alpine/Dockerfile +++ b/24/fpm-alpine/Dockerfile @@ -6,7 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ - php8-pecl-imagick \ + imagemagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile index 05a82ea07..1b068789f 100644 --- a/25/fpm-alpine/Dockerfile +++ b/25/fpm-alpine/Dockerfile @@ -6,7 +6,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ - php8-pecl-imagick \ + imagemagick \ ; \ \ rm /var/spool/cron/crontabs/root; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 545191da6..84d973951 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -5,7 +5,7 @@ RUN set -ex; \ \ apk add --no-cache \ rsync \ - php8-pecl-imagick \ + imagemagick \ ; \ \ rm /var/spool/cron/crontabs/root; \