Skip to content

Commit 9dda2f6

Browse files
committed
image optimizers libraries
1 parent ca5a1ee commit 9dda2f6

8 files changed

Lines changed: 76 additions & 0 deletions

File tree

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ services:
3232
- INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER}
3333
- INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW}
3434
- INSTALL_MC=${WORKSPACE_INSTALL_MC}
35+
- INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS}
3536
- PUID=${WORKSPACE_PUID}
3637
- PGID=${WORKSPACE_PGID}
3738
- NODE_VERSION=${WORKSPACE_NODE_VERSION}
@@ -75,6 +76,7 @@ services:
7576
- INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
7677
- INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
7778
- INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
79+
- INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
7880
dockerfile: "Dockerfile-${PHP_VERSION}"
7981
volumes_from:
8082
- applications

env-example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ WORKSPACE_INSTALL_LARAVEL_INSTALLER=false
4545
WORKSPACE_INSTALL_DEPLOYER=false
4646
WORKSPACE_INSTALL_LINUXBREW=false
4747
WORKSPACE_INSTALL_MC=false
48+
WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
4849
WORKSPACE_PUID=1000
4950
WORKSPACE_PGID=1000
5051
WORKSPACE_NODE_VERSION=stable
@@ -71,6 +72,7 @@ PHP_FPM_INSTALL_INTL=false
7172
PHP_FPM_INSTALL_GHOSTSCRIPT=false
7273
PHP_FPM_INSTALL_LDAP=false
7374
PHP_FPM_INSTALL_SWOOLE=false
75+
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
7476

7577
### NGINX ##############################################################################################################
7678

php-fpm/Dockerfile-56

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,17 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
258258
docker-php-ext-enable mssql pdo pdo_dblib \
259259
;fi
260260

261+
#####################################
262+
# Image optimizers:
263+
#####################################
264+
USER root
265+
ARG INSTALL_IMAGE_OPTIMIZERS=false
266+
ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS}
267+
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
268+
apt-get update -yqq && \
269+
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \
270+
;fi
271+
261272
#
262273
#--------------------------------------------------------------------------
263274
# Final Touch

php-fpm/Dockerfile-70

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,17 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
282282
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
283283
;fi
284284

285+
#####################################
286+
# Image optimizers:
287+
#####################################
288+
USER root
289+
ARG INSTALL_IMAGE_OPTIMIZERS=false
290+
ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS}
291+
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
292+
apt-get update -yqq && \
293+
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \
294+
;fi
295+
285296
#
286297
#--------------------------------------------------------------------------
287298
# Final Touch

php-fpm/Dockerfile-71

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,17 @@ RUN if [ ${INSTALL_MSSQL} = true ]; then \
289289
&& docker-php-ext-enable pdo_sqlsrv sqlsrv \
290290
;fi
291291

292+
#####################################
293+
# Image optimizers:
294+
#####################################
295+
USER root
296+
ARG INSTALL_IMAGE_OPTIMIZERS=false
297+
ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS}
298+
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
299+
apt-get update -yqq && \
300+
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \
301+
;fi
302+
292303
#
293304
#--------------------------------------------------------------------------
294305
# Final Touch

workspace/Dockerfile-56

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,19 @@ RUN if [ ${INSTALL_MC} = true ]; then\
425425
chmod +x /usr/local/bin/mc \
426426
;fi
427427

428+
#####################################
429+
# Image optimizers:
430+
#####################################
431+
USER root
432+
ARG INSTALL_IMAGE_OPTIMIZERS=false
433+
ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS}
434+
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
435+
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle && \
436+
if [ ${INSTALL_NODE} = true ]; then \
437+
. ~/.bashrc && npm install -g svgo \
438+
;fi\
439+
;fi
440+
428441
USER laradock
429442

430443
#

workspace/Dockerfile-70

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,19 @@ RUN if [ ${INSTALL_SYMFONY} = true ]; then \
530530

531531
;fi
532532

533+
#####################################
534+
# Image optimizers:
535+
#####################################
536+
USER root
537+
ARG INSTALL_IMAGE_OPTIMIZERS=false
538+
ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS}
539+
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
540+
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle && \
541+
if [ ${INSTALL_NODE} = true ]; then \
542+
. ~/.bashrc && npm install -g svgo \
543+
;fi\
544+
;fi
545+
533546
#
534547
#--------------------------------------------------------------------------
535548
# Final Touch

workspace/Dockerfile-71

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,19 @@ RUN if [ ${INSTALL_SYMFONY} = true ]; then \
533533

534534
;fi
535535

536+
#####################################
537+
# Image optimizers:
538+
#####################################
539+
USER root
540+
ARG INSTALL_IMAGE_OPTIMIZERS=false
541+
ENV INSTALL_IMAGE_OPTIMIZERS ${INSTALL_IMAGE_OPTIMIZERS}
542+
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
543+
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle && \
544+
if [ ${INSTALL_NODE} = true ]; then \
545+
. ~/.bashrc && npm install -g svgo \
546+
;fi\
547+
;fi
548+
536549
USER laradock
537550

538551
#

0 commit comments

Comments
 (0)