diff --git a/docker-compose.yml b/docker-compose.yml index 8f397d62..29b0109a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,6 +32,7 @@ services: - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER} - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW} - INSTALL_MC=${WORKSPACE_INSTALL_MC} + - INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS} - PUID=${WORKSPACE_PUID} - PGID=${WORKSPACE_PGID} - NODE_VERSION=${WORKSPACE_NODE_VERSION} @@ -75,6 +76,7 @@ services: - INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT} - INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP} - INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE} + - INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS} dockerfile: "Dockerfile-${PHP_VERSION}" volumes_from: - applications diff --git a/env-example b/env-example index 72aa07f0..23eba15a 100644 --- a/env-example +++ b/env-example @@ -45,6 +45,7 @@ WORKSPACE_INSTALL_LARAVEL_INSTALLER=false WORKSPACE_INSTALL_DEPLOYER=false WORKSPACE_INSTALL_LINUXBREW=false WORKSPACE_INSTALL_MC=false +WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false WORKSPACE_PUID=1000 WORKSPACE_PGID=1000 WORKSPACE_NODE_VERSION=stable @@ -71,6 +72,7 @@ PHP_FPM_INSTALL_INTL=false PHP_FPM_INSTALL_GHOSTSCRIPT=false PHP_FPM_INSTALL_LDAP=false PHP_FPM_INSTALL_SWOOLE=false +PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false ### NGINX ############################################################################################################## diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index cad89a5d..1d8fd976 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -258,6 +258,17 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ docker-php-ext-enable mssql pdo pdo_dblib \ ;fi +##################################### +# Image optimizers: +##################################### +USER root +ARG INSTALL_IMAGE_OPTIMIZERS=false +ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS} +RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ + apt-get update -yqq && \ + apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index b14adacb..b643a384 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -282,6 +282,17 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ && docker-php-ext-enable pdo_sqlsrv sqlsrv \ ;fi +##################################### +# Image optimizers: +##################################### +USER root +ARG INSTALL_IMAGE_OPTIMIZERS=false +ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS} +RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ + apt-get update -yqq && \ + apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 3a71dc21..90ea2bd0 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -289,6 +289,17 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \ && docker-php-ext-enable pdo_sqlsrv sqlsrv \ ;fi +##################################### +# Image optimizers: +##################################### +USER root +ARG INSTALL_IMAGE_OPTIMIZERS=false +ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS} +RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ + apt-get update -yqq && \ + apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index f945358d..076eda32 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -425,6 +425,19 @@ RUN if [ ${INSTALL_MC} = true ]; then\ chmod +x /usr/local/bin/mc \ ;fi +##################################### +# Image optimizers: +##################################### +USER root +ARG INSTALL_IMAGE_OPTIMIZERS=false +ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS} +RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ + apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle && \ + if [ ${INSTALL_NODE} = true ]; then \ + . ~/.bashrc && npm install -g svgo \ + ;fi\ +;fi + USER laradock # diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 0ee2b70d..3751c7ac 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -530,6 +530,19 @@ RUN if [ ${INSTALL_SYMFONY} = true ]; then \ ;fi +##################################### +# Image optimizers: +##################################### +USER root +ARG INSTALL_IMAGE_OPTIMIZERS=false +ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS} +RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ + apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle && \ + if [ ${INSTALL_NODE} = true ]; then \ + . ~/.bashrc && npm install -g svgo \ + ;fi\ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index e5525c12..c66befb5 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -533,6 +533,19 @@ RUN if [ ${INSTALL_SYMFONY} = true ]; then \ ;fi +##################################### +# Image optimizers: +##################################### +USER root +ARG INSTALL_IMAGE_OPTIMIZERS=false +ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS} +RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ + apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle && \ + if [ ${INSTALL_NODE} = true ]; then \ + . ~/.bashrc && npm install -g svgo \ + ;fi\ +;fi + USER laradock #