Merge pull request #575 from rcdailey/imagick

Add imagick php extension

.examples/README.md

@@ -32,11 +32,6 @@ The required steps for each optional/recommended package that is not already in
 #### PHP Module bz2
 `docker-php-ext-install bz2`  
 
-#### PHP Module imagick
-`apt install libmagickwand-dev`  
-`pecl install imagick`  
-`docker-php-ext-enable imagick`  
-
 #### PHP Module imap
 `apt install libc-client-dev libkrb5-dev`  
 `docker-php-ext-configure imap --with-kerberos --with-imap-ssl`  

.examples/dockerfiles/full/apache/Dockerfile

@@ -4,7 +4,7 @@ RUN mkdir -p /usr/share/man/man1 \
     && apt-get update && apt-get install -y \
         supervisor \
         ffmpeg \
-        libmagickwand-dev \
+        libbz2-dev \
         libgmp3-dev \
         libc-client-dev \
         libkrb5-dev \
@@ -15,8 +15,8 @@ RUN mkdir -p /usr/share/man/man1 \
     && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
     && docker-php-ext-install bz2 gmp imap \
-    && pecl install imagick smbclient \
-    && docker-php-ext-enable imagick smbclient \
+    && pecl install smbclient \
+    && docker-php-ext-enable smbclient \
     && mkdir /var/log/supervisord /var/run/supervisord
 
 COPY supervisord.conf /etc/supervisor/supervisord.conf

.examples/dockerfiles/full/fpm/Dockerfile

@@ -4,7 +4,7 @@ RUN mkdir -p /usr/share/man/man1 \
     && apt-get update && apt-get install -y \
         supervisor \
         ffmpeg \
-        libmagickwand-dev \
+        libbz2-dev \
         libgmp3-dev \
         libc-client-dev \
         libkrb5-dev \
@@ -15,8 +15,8 @@ RUN mkdir -p /usr/share/man/man1 \
     && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
     && docker-php-ext-install bz2 gmp imap \
-    && pecl install imagick smbclient \
-    && docker-php-ext-enable imagick smbclient \
+    && pecl install smbclient \
+    && docker-php-ext-enable smbclient \
     && mkdir /var/log/supervisord /var/run/supervisord
 
 COPY supervisord.conf /etc/supervisor/supervisord.conf

13.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

13.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="$( \

13.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

14.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

14.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="$( \

14.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

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

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="$( \

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

Dockerfile-alpine.template

@@ -27,6 +27,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; \
@@ -47,11 +48,13 @@ RUN set -ex; \
     pecl install APCu-%%APCU_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
     runDeps="$( \

Dockerfile-debian.template

@@ -32,6 +32,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -53,11 +54,13 @@ RUN set -ex; \
     pecl install APCu-%%APCU_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

update.sh

@@ -28,6 +28,7 @@ declare -A pecl_versions=(
 	[APCu]='5.1.15'
 	[memcached]='3.0.4'
 	[redis]='4.2.0'
+	[imagick]='3.4.3'
 )
 
 variants=(
@@ -78,6 +79,7 @@ function create_variant() {
 		s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
 		s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
 		s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
+		s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
 	' "$dir/Dockerfile"
 
 	# Copy the shell scripts