Skip to content

Commit b2e3720

Browse files
committed
Fixed php-fpm build
1 parent 0a23d53 commit b2e3720

8 files changed

Lines changed: 14 additions & 6 deletions

File tree

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ services:
8282
- INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
8383
- INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
8484
- INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
85+
- INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK}
8586
dockerfile: "Dockerfile-${PHP_VERSION}"
8687
volumes_from:
8788
- applications

env-example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false
7878
PHP_FPM_INSTALL_LDAP=false
7979
PHP_FPM_INSTALL_SWOOLE=false
8080
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
81+
PHP_FPM_INSTALL_IMAGEMAGICK=false
8182

8283
### NGINX ##############################################################################################################
8384

php-fpm/Dockerfile-56

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,9 @@ USER root
276276
ARG INSTALL_IMAGEMAGICK=false
277277
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
278278
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
279-
apt-get install -y --force-yes imagemagick php-imagick && \
279+
apt-get update -y && \
280+
apt-get install -y libmagickwand-dev imagemagick && \
281+
pecl install imagick && \
280282
docker-php-ext-enable imagick \
281283
;fi
282284

php-fpm/Dockerfile-70

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,9 @@ USER root
300300
ARG INSTALL_IMAGEMAGICK=false
301301
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
302302
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
303-
apt-get install -y --force-yes imagemagick php-imagick && \
303+
apt-get update -y && \
304+
apt-get install -y libmagickwand-dev imagemagick && \
305+
pecl install imagick && \
304306
docker-php-ext-enable imagick \
305307
;fi
306308

php-fpm/Dockerfile-71

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,9 @@ USER root
307307
ARG INSTALL_IMAGEMAGICK=false
308308
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
309309
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
310-
apt-get install -y --force-yes imagemagick php-imagick && \
310+
apt-get update -y && \
311+
apt-get install -y libmagickwand-dev imagemagick && \
312+
pecl install imagick && \
311313
docker-php-ext-enable imagick \
312314
;fi
313315

workspace/Dockerfile-56

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ USER root
503503
ARG INSTALL_IMAGEMAGICK=false
504504
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
505505
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
506-
apt-get install -y --force-yes imagemagick \
506+
apt-get install -y --force-yes imagemagick php-imagick \
507507
;fi
508508

509509
#

workspace/Dockerfile-70

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ USER root
584584
ARG INSTALL_IMAGEMAGICK=false
585585
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
586586
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
587-
apt-get install -y --force-yes imagemagick \
587+
apt-get install -y --force-yes imagemagick php-imagick \
588588
;fi
589589

590590
#

workspace/Dockerfile-71

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ USER root
589589
ARG INSTALL_IMAGEMAGICK=false
590590
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
591591
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
592-
apt-get install -y --force-yes imagemagick \
592+
apt-get install -y --force-yes imagemagick php-imagick \
593593
;fi
594594

595595
#

0 commit comments

Comments
 (0)