Added support of ImageMagick
This commit is contained in:
parent
8485add87a
commit
b61ff4f484
|
@ -37,6 +37,7 @@ services:
|
||||||
- INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY}
|
- INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY}
|
||||||
- INSTALL_PYTHON=${WORKSPACE_INSTALL_PYTHON}
|
- INSTALL_PYTHON=${WORKSPACE_INSTALL_PYTHON}
|
||||||
- INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS}
|
- INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS}
|
||||||
|
- INSTALL_IMAGEMAGICK=${WORKSPACE_INSTALL_IMAGEMAGICK}
|
||||||
- PUID=${WORKSPACE_PUID}
|
- PUID=${WORKSPACE_PUID}
|
||||||
- PGID=${WORKSPACE_PGID}
|
- PGID=${WORKSPACE_PGID}
|
||||||
- NODE_VERSION=${WORKSPACE_NODE_VERSION}
|
- NODE_VERSION=${WORKSPACE_NODE_VERSION}
|
||||||
|
|
|
@ -50,6 +50,7 @@ WORKSPACE_INSTALL_MC=false
|
||||||
WORKSPACE_INSTALL_SYMFONY=false
|
WORKSPACE_INSTALL_SYMFONY=false
|
||||||
WORKSPACE_INSTALL_PYTHON=false
|
WORKSPACE_INSTALL_PYTHON=false
|
||||||
WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
|
WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
|
||||||
|
WORKSPACE_INSTALL_IMAGEMAGICK=false
|
||||||
WORKSPACE_PUID=1000
|
WORKSPACE_PUID=1000
|
||||||
WORKSPACE_PGID=1000
|
WORKSPACE_PGID=1000
|
||||||
WORKSPACE_NODE_VERSION=stable
|
WORKSPACE_NODE_VERSION=stable
|
||||||
|
|
|
@ -496,6 +496,16 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \
|
||||||
&& pip install --upgrade virtualenv \
|
&& pip install --upgrade virtualenv \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# ImageMagick:
|
||||||
|
#####################################
|
||||||
|
USER root
|
||||||
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
|
apt-get install -y --force-yes imagemagick php-imagick && \
|
||||||
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
# Final Touch
|
# Final Touch
|
||||||
|
|
|
@ -577,6 +577,16 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \
|
||||||
&& pip install --upgrade virtualenv \
|
&& pip install --upgrade virtualenv \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# ImageMagick:
|
||||||
|
#####################################
|
||||||
|
USER root
|
||||||
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
|
apt-get install -y --force-yes imagemagick php-imagick && \
|
||||||
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
# Final Touch
|
# Final Touch
|
||||||
|
|
|
@ -582,6 +582,15 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \
|
||||||
&& pip install --upgrade virtualenv \
|
&& pip install --upgrade virtualenv \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# ImageMagick:
|
||||||
|
#####################################
|
||||||
|
USER root
|
||||||
|
ARG INSTALL_IMAGEMAGICK=false
|
||||||
|
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
|
||||||
|
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
|
||||||
|
apt-get install -y --force-yes imagemagick php-imagick && \
|
||||||
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue