Fixed php-fpm build
This commit is contained in:
parent
0a23d53ee5
commit
b2e372054f
|
@ -82,6 +82,7 @@ services:
|
||||||
- INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
|
- INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
|
||||||
- INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
|
- INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
|
||||||
- INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
|
- INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
|
||||||
|
- INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK}
|
||||||
dockerfile: "Dockerfile-${PHP_VERSION}"
|
dockerfile: "Dockerfile-${PHP_VERSION}"
|
||||||
volumes_from:
|
volumes_from:
|
||||||
- applications
|
- applications
|
||||||
|
|
|
@ -78,6 +78,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false
|
||||||
PHP_FPM_INSTALL_LDAP=false
|
PHP_FPM_INSTALL_LDAP=false
|
||||||
PHP_FPM_INSTALL_SWOOLE=false
|
PHP_FPM_INSTALL_SWOOLE=false
|
||||||
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
|
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
|
||||||
|
PHP_FPM_INSTALL_IMAGEMAGICK=false
|
||||||
|
|
||||||
### NGINX ##############################################################################################################
|
### NGINX ##############################################################################################################
|
||||||
|
|
||||||
|
|
|
@ -276,7 +276,9 @@ USER root
|
||||||
ARG INSTALL_IMAGEMAGICK=false
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
apt-get install -y --force-yes imagemagick php-imagick && \
|
apt-get update -y && \
|
||||||
|
apt-get install -y libmagickwand-dev imagemagick && \
|
||||||
|
pecl install imagick && \
|
||||||
docker-php-ext-enable imagick \
|
docker-php-ext-enable imagick \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
|
|
@ -300,7 +300,9 @@ USER root
|
||||||
ARG INSTALL_IMAGEMAGICK=false
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
apt-get install -y --force-yes imagemagick php-imagick && \
|
apt-get update -y && \
|
||||||
|
apt-get install -y libmagickwand-dev imagemagick && \
|
||||||
|
pecl install imagick && \
|
||||||
docker-php-ext-enable imagick \
|
docker-php-ext-enable imagick \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
|
|
@ -307,7 +307,9 @@ USER root
|
||||||
ARG INSTALL_IMAGEMAGICK=false
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
apt-get install -y --force-yes imagemagick php-imagick && \
|
apt-get update -y && \
|
||||||
|
apt-get install -y libmagickwand-dev imagemagick && \
|
||||||
|
pecl install imagick && \
|
||||||
docker-php-ext-enable imagick \
|
docker-php-ext-enable imagick \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
|
|
@ -503,7 +503,7 @@ USER root
|
||||||
ARG INSTALL_IMAGEMAGICK=false
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
apt-get install -y --force-yes imagemagick \
|
apt-get install -y --force-yes imagemagick php-imagick \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -584,7 +584,7 @@ USER root
|
||||||
ARG INSTALL_IMAGEMAGICK=false
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
apt-get install -y --force-yes imagemagick \
|
apt-get install -y --force-yes imagemagick php-imagick \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -589,7 +589,7 @@ USER root
|
||||||
ARG INSTALL_IMAGEMAGICK=false
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
apt-get install -y --force-yes imagemagick \
|
apt-get install -y --force-yes imagemagick php-imagick \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue