From b61ff4f484c2d9477a2a6b0e4a4486aa8524e130 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 02:36:24 +0300 Subject: [PATCH 1/6] Added support of ImageMagick --- docker-compose.yml | 1 + env-example | 1 + workspace/Dockerfile-56 | 10 ++++++++++ workspace/Dockerfile-70 | 10 ++++++++++ workspace/Dockerfile-71 | 9 +++++++++ 5 files changed, 31 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index fcd2342b..3f7506f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,7 @@ services: - INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY} - INSTALL_PYTHON=${WORKSPACE_INSTALL_PYTHON} - INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS} + - INSTALL_IMAGEMAGICK=${WORKSPACE_INSTALL_IMAGEMAGICK} - PUID=${WORKSPACE_PUID} - PGID=${WORKSPACE_PGID} - NODE_VERSION=${WORKSPACE_NODE_VERSION} diff --git a/env-example b/env-example index fd73b994..6302c697 100644 --- a/env-example +++ b/env-example @@ -50,6 +50,7 @@ WORKSPACE_INSTALL_MC=false WORKSPACE_INSTALL_SYMFONY=false WORKSPACE_INSTALL_PYTHON=false WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false +WORKSPACE_INSTALL_IMAGEMAGICK=false WORKSPACE_PUID=1000 WORKSPACE_PGID=1000 WORKSPACE_NODE_VERSION=stable diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 5e775e54..cbc10baa 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -496,6 +496,16 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \ && pip install --upgrade virtualenv \ ;fi +##################################### +# ImageMagick: +##################################### +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 && \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 48443a2b..a6d38e69 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -577,6 +577,16 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \ && pip install --upgrade virtualenv \ ;fi +##################################### +# ImageMagick: +##################################### +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 && \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index cba070d5..c1ad0f6c 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -582,6 +582,15 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \ && pip install --upgrade virtualenv \ ;fi +##################################### +# ImageMagick: +##################################### +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 && \ +;fi # #-------------------------------------------------------------------------- From f9e6acd4e19e1aeca8f6f028a6ab24c389b25a7d Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 03:15:24 +0300 Subject: [PATCH 2/6] Fix syntax error --- workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index cbc10baa..de180687 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 php-imagick \ ;fi # diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index a6d38e69..9ca8e6c0 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 php-imagick \ ;fi # diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index c1ad0f6c..b6f423fd 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 php-imagick \ ;fi # From f6552aca97f0483bb48a76f7997e903a154a30c8 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 21:09:34 +0300 Subject: [PATCH 3/6] Added support of ImageMagick to php-fpm --- php-fpm/Dockerfile-56 | 10 ++++++++++ php-fpm/Dockerfile-70 | 10 ++++++++++ php-fpm/Dockerfile-71 | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 1b240c45..7a623e09 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -269,6 +269,16 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ ;fi +##################################### +# ImageMagick: +##################################### +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 \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 1028fbc9..349f614f 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -293,6 +293,16 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ ;fi +##################################### +# ImageMagick: +##################################### +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 \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index b58a0ee3..63992b88 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -300,6 +300,16 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ ;fi +##################################### +# ImageMagick: +##################################### +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 \ +;fi + # #-------------------------------------------------------------------------- # Final Touch From 0a23d53ee5640936f52836338b06dd82da7331b3 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 21:47:47 +0300 Subject: [PATCH 4/6] 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 # From b2e372054fad67623634260b48a48fbc0ec49386 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 23:36:30 +0300 Subject: [PATCH 5/6] Fixed php-fpm build --- docker-compose.yml | 1 + env-example | 1 + php-fpm/Dockerfile-56 | 4 +++- php-fpm/Dockerfile-70 | 4 +++- php-fpm/Dockerfile-71 | 4 +++- workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- 8 files changed, 14 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3f7506f0..d7ddf84f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,6 +82,7 @@ services: - INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP} - INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE} - INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS} + - INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK} dockerfile: "Dockerfile-${PHP_VERSION}" volumes_from: - applications diff --git a/env-example b/env-example index 6302c697..34670e71 100644 --- a/env-example +++ b/env-example @@ -78,6 +78,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false PHP_FPM_INSTALL_LDAP=false PHP_FPM_INSTALL_SWOOLE=false PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false +PHP_FPM_INSTALL_IMAGEMAGICK=false ### NGINX ############################################################################################################## diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 0caf4d3f..6c1d19e2 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -276,7 +276,9 @@ 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 update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ docker-php-ext-enable imagick \ ;fi diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 264c9bb8..c1bdcd10 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -300,7 +300,9 @@ 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 update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ docker-php-ext-enable imagick \ ;fi diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 66bf4632..74682248 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -307,7 +307,9 @@ 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 update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ docker-php-ext-enable imagick \ ;fi diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index b6e1de22..de180687 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 \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 824c4a3e..9ca8e6c0 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 \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 3030447b..b6f423fd 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 \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # From 5c5f94600a4430f5932703a74bcca5a922fd0b81 Mon Sep 17 00:00:00 2001 From: Arhey Date: Wed, 6 Sep 2017 00:22:18 +0300 Subject: [PATCH 6/6] Rename laravel.pool.conf to xlaravel.pool.conf Fix issue #1011 --- php-fpm/Dockerfile-56 | 2 +- php-fpm/Dockerfile-70 | 2 +- php-fpm/Dockerfile-71 | 2 +- php-fpm/{laravel.pool.conf => xlaravel.pool.conf} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename php-fpm/{laravel.pool.conf => xlaravel.pool.conf} (100%) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 6c1d19e2..ed8cb892 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -289,7 +289,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ # ADD ./laravel.ini /usr/local/etc/php/conf.d -ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/ +ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index c1bdcd10..daf214ab 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -313,7 +313,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ # ADD ./laravel.ini /usr/local/etc/php/conf.d/ -ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/ +ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 74682248..1210f292 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -320,7 +320,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ # ADD ./laravel.ini /usr/local/etc/php/conf.d -ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/ +ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/laravel.pool.conf b/php-fpm/xlaravel.pool.conf similarity index 100% rename from php-fpm/laravel.pool.conf rename to php-fpm/xlaravel.pool.conf