From 2f90715d31ddfc0983ab6b55918ee8078e506f0b Mon Sep 17 00:00:00 2001
From: Robert Dailey <rcdailey@gmail.com>
Date: Mon, 10 Dec 2018 18:06:21 -0600
Subject: Add imagick php extension

There is a warning issued in Nextcloud 15 about 'imagick' php extension not
being present. They highly recommend that it be installed.

Fixes #574, fixes #263

Signed-off-by: Robert Dailey <rcdailey@gmail.com>
---
 15.0/apache/Dockerfile     | 3 +++
 15.0/fpm-alpine/Dockerfile | 3 +++
 15.0/fpm/Dockerfile        | 3 +++
 3 files changed, 9 insertions(+)

(limited to '15.0')

diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile
index 48f1195b..454842aa 100644
--- a/15.0/apache/Dockerfile
+++ b/15.0/apache/Dockerfile
@@ -33,6 +33,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -54,11 +55,13 @@ RUN set -ex; \
     pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
     pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile
index d015b235..d6ac2a2e 100644
--- a/15.0/fpm-alpine/Dockerfile
+++ b/15.0/fpm-alpine/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex; \
         openldap-dev \
         pcre-dev \
         postgresql-dev \
+        imagemagick-dev \
     ; \
     \
     docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@@ -48,11 +49,13 @@ RUN set -ex; \
     pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
     pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
     runDeps="$( \
diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile
index 6b2c696a..8cc1df2a 100644
--- a/15.0/fpm/Dockerfile
+++ b/15.0/fpm/Dockerfile
@@ -33,6 +33,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -54,11 +55,13 @@ RUN set -ex; \
     pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
     pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-- 
cgit v1.2.3