summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Lamp <32171364+modzilla99@users.noreply.github.com>2022-11-15 14:36:51 +0100
committerGitHub <noreply@github.com>2022-11-15 14:36:51 +0100
commitdfb538c5c77f017062f50b794f90594a594665e6 (patch)
tree3eb670835816bcf04a33b88293af8510ebccf9f8
parent625445fbe9ab19497d0f68128fa59b4e778303e3 (diff)
Fixes warning about svg support missing (#1789)
* Include imagick in all flavours Signed-off-by: Justin Lamp <justin.lamp@netways.de> * Fix alpine imagick version Signed-off-by: Justin Lamp <justin.lamp@netways.de> * Changed alpine package to imagemagick php extension is already present, so only install imagemagick Signed-off-by: modzilla99 <justin.lamp96@gmail.com> Signed-off-by: Justin Lamp <justin.lamp@netways.de> Signed-off-by: modzilla99 <justin.lamp96@gmail.com>
-rw-r--r--23/apache/Dockerfile1
-rw-r--r--23/fpm-alpine/Dockerfile1
-rw-r--r--23/fpm/Dockerfile1
-rw-r--r--24/apache/Dockerfile1
-rw-r--r--24/fpm-alpine/Dockerfile1
-rw-r--r--24/fpm/Dockerfile1
-rw-r--r--25/apache/Dockerfile1
-rw-r--r--25/fpm-alpine/Dockerfile1
-rw-r--r--25/fpm/Dockerfile1
-rw-r--r--Dockerfile-alpine.template1
-rw-r--r--Dockerfile-debian.template1
11 files changed, 11 insertions, 0 deletions
diff --git a/23/apache/Dockerfile b/23/apache/Dockerfile
index a08d14cc..eb774dc3 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 98ced82b..2c2757c8 100644
--- a/23/fpm-alpine/Dockerfile
+++ b/23/fpm-alpine/Dockerfile
@@ -6,6 +6,7 @@ RUN set -ex; \
\
apk add --no-cache \
rsync \
+ imagemagick \
; \
\
rm /var/spool/cron/crontabs/root; \
diff --git a/23/fpm/Dockerfile b/23/fpm/Dockerfile
index caed3494..198da7e1 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 89752e76..b0a5fa2c 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 3eba47c2..124e2891 100644
--- a/24/fpm-alpine/Dockerfile
+++ b/24/fpm-alpine/Dockerfile
@@ -6,6 +6,7 @@ RUN set -ex; \
\
apk add --no-cache \
rsync \
+ imagemagick \
; \
\
rm /var/spool/cron/crontabs/root; \
diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile
index c19bd006..01d50bfa 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 bef15bf2..accae666 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 7ba4bbda..1b068789 100644
--- a/25/fpm-alpine/Dockerfile
+++ b/25/fpm-alpine/Dockerfile
@@ -6,6 +6,7 @@ RUN set -ex; \
\
apk add --no-cache \
rsync \
+ imagemagick \
; \
\
rm /var/spool/cron/crontabs/root; \
diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile
index 8d1ae069..34a7a1ab 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 41146002..84d97395 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -5,6 +5,7 @@ RUN set -ex; \
\
apk add --no-cache \
rsync \
+ imagemagick \
; \
\
rm /var/spool/cron/crontabs/root; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index a13f0e27..4d2e6044 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/*; \
\