From 0a23d53ee5640936f52836338b06dd82da7331b3 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 21:47:47 +0300 Subject: [PATCH] Move php-imagick to php-fpm and enable it --- php-fpm/Dockerfile-56 | 3 ++- php-fpm/Dockerfile-70 | 3 ++- php-fpm/Dockerfile-71 | 3 ++- workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 7a623e09..0caf4d3f 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -276,7 +276,8 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick php-imagick && \ + docker-php-ext-enable imagick \ ;fi # diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 349f614f..264c9bb8 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -300,7 +300,8 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick php-imagick && \ + docker-php-ext-enable imagick \ ;fi # diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 63992b88..66bf4632 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -307,7 +307,8 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick php-imagick && \ + docker-php-ext-enable imagick \ ;fi # diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index de180687..b6e1de22 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -503,7 +503,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick \ ;fi # diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 9ca8e6c0..824c4a3e 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -584,7 +584,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick \ ;fi # diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index b6f423fd..3030447b 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -589,7 +589,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick \ ;fi #