Skip to content

Commit 801ccd4

Browse files
MahmoudzMahmoudz
authored
Merge pull request laradock#1121 from freearhey/master
Added support of ImageMagick
2 parents e9806d9 + 5c5f946 commit 801ccd4

9 files changed

Lines changed: 75 additions & 3 deletions

File tree

‎docker-compose.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ services:
3737
- INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY}
3838
- INSTALL_PYTHON=${WORKSPACE_INSTALL_PYTHON}
3939
- INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS}
40+
- INSTALL_IMAGEMAGICK=${WORKSPACE_INSTALL_IMAGEMAGICK}
4041
- PUID=${WORKSPACE_PUID}
4142
- PGID=${WORKSPACE_PGID}
4243
- NODE_VERSION=${WORKSPACE_NODE_VERSION}
@@ -81,6 +82,7 @@ services:
8182
- INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
8283
- INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
8384
- INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
85+
- INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK}
8486
dockerfile: "Dockerfile-${PHP_VERSION}"
8587
volumes_from:
8688
- applications

‎env-example‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ WORKSPACE_INSTALL_MC=false
5050
WORKSPACE_INSTALL_SYMFONY=false
5151
WORKSPACE_INSTALL_PYTHON=false
5252
WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
53+
WORKSPACE_INSTALL_IMAGEMAGICK=false
5354
WORKSPACE_PUID=1000
5455
WORKSPACE_PGID=1000
5556
WORKSPACE_NODE_VERSION=stable
@@ -77,6 +78,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false
7778
PHP_FPM_INSTALL_LDAP=false
7879
PHP_FPM_INSTALL_SWOOLE=false
7980
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
81+
PHP_FPM_INSTALL_IMAGEMAGICK=false
8082

8183
### NGINX ##############################################################################################################
8284

‎php-fpm/Dockerfile-56‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,27 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
269269
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \
270270
;fi
271271

272+
#####################################
273+
# ImageMagick:
274+
#####################################
275+
USER root
276+
ARG INSTALL_IMAGEMAGICK=false
277+
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
278+
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
279+
apt-get update -y && \
280+
apt-get install -y libmagickwand-dev imagemagick && \
281+
pecl install imagick && \
282+
docker-php-ext-enable imagick \
283+
;fi
284+
272285
#
273286
#--------------------------------------------------------------------------
274287
# Final Touch
275288
#--------------------------------------------------------------------------
276289
#
277290

278291
ADD ./laravel.ini /usr/local/etc/php/conf.d
279-
ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
292+
ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
280293

281294
#RUN rm -r /var/lib/apt/lists/*
282295

‎php-fpm/Dockerfile-70‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,14 +293,27 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
293293
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \
294294
;fi
295295

296+
#####################################
297+
# ImageMagick:
298+
#####################################
299+
USER root
300+
ARG INSTALL_IMAGEMAGICK=false
301+
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
302+
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
303+
apt-get update -y && \
304+
apt-get install -y libmagickwand-dev imagemagick && \
305+
pecl install imagick && \
306+
docker-php-ext-enable imagick \
307+
;fi
308+
296309
#
297310
#--------------------------------------------------------------------------
298311
# Final Touch
299312
#--------------------------------------------------------------------------
300313
#
301314

302315
ADD ./laravel.ini /usr/local/etc/php/conf.d/
303-
ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
316+
ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
304317

305318
#RUN rm -r /var/lib/apt/lists/*
306319

‎php-fpm/Dockerfile-71‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,27 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
300300
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \
301301
;fi
302302

303+
#####################################
304+
# ImageMagick:
305+
#####################################
306+
USER root
307+
ARG INSTALL_IMAGEMAGICK=false
308+
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
309+
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
310+
apt-get update -y && \
311+
apt-get install -y libmagickwand-dev imagemagick && \
312+
pecl install imagick && \
313+
docker-php-ext-enable imagick \
314+
;fi
315+
303316
#
304317
#--------------------------------------------------------------------------
305318
# Final Touch
306319
#--------------------------------------------------------------------------
307320
#
308321

309322
ADD ./laravel.ini /usr/local/etc/php/conf.d
310-
ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
323+
ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
311324

312325
#RUN rm -r /var/lib/apt/lists/*
313326

php-fpm/laravel.pool.conf renamed to php-fpm/xlaravel.pool.conf

File renamed without changes.

‎workspace/Dockerfile-56‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,16 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \
499499
&& pip install --upgrade virtualenv \
500500
;fi
501501

502+
#####################################
503+
# ImageMagick:
504+
#####################################
505+
USER root
506+
ARG INSTALL_IMAGEMAGICK=false
507+
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
508+
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
509+
apt-get install -y --force-yes imagemagick php-imagick \
510+
;fi
511+
502512
#
503513
#--------------------------------------------------------------------------
504514
# Final Touch

‎workspace/Dockerfile-70‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,16 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \
580580
&& pip install --upgrade virtualenv \
581581
;fi
582582

583+
#####################################
584+
# ImageMagick:
585+
#####################################
586+
USER root
587+
ARG INSTALL_IMAGEMAGICK=false
588+
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
589+
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
590+
apt-get install -y --force-yes imagemagick php-imagick \
591+
;fi
592+
583593
#
584594
#--------------------------------------------------------------------------
585595
# Final Touch

‎workspace/Dockerfile-71‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,15 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \
586586
&& pip install --upgrade virtualenv \
587587
;fi
588588

589+
#####################################
590+
# ImageMagick:
591+
#####################################
592+
USER root
593+
ARG INSTALL_IMAGEMAGICK=false
594+
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
595+
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
596+
apt-get install -y --force-yes imagemagick php-imagick \
597+
;fi
589598

590599
#
591600
#--------------------------------------------------------------------------

0 commit comments

Comments
 (0)