diff --git a/docker-compose.yml b/docker-compose.yml index fcd2342b..d7ddf84f 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} @@ -81,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 fd73b994..34670e71 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 @@ -77,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 1b240c45..ed8cb892 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -269,6 +269,19 @@ 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 update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ + docker-php-ext-enable imagick \ +;fi + # #-------------------------------------------------------------------------- # Final Touch @@ -276,7 +289,7 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = 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 1028fbc9..daf214ab 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -293,6 +293,19 @@ 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 update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ + docker-php-ext-enable imagick \ +;fi + # #-------------------------------------------------------------------------- # Final Touch @@ -300,7 +313,7 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = 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 b58a0ee3..1210f292 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -300,6 +300,19 @@ 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 update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ + docker-php-ext-enable imagick \ +;fi + # #-------------------------------------------------------------------------- # Final Touch @@ -307,7 +320,7 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = 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 diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 46c72585..bac3ee92 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -499,6 +499,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 1f56aa0c..20188169 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -580,6 +580,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 915a9cf5..aeaec9c0 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -586,6 +586,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 # #--------------------------------------------------------------------------