Added wkhtmltopdf installation to both Workspace and PHP-FPM
This commit is contained in:
parent
cd84c464b3
commit
8ecd35d2e9
@ -138,6 +138,7 @@ services:
|
|||||||
- INSTALL_POWERLINE=${WORKSPACE_INSTALL_POWERLINE}
|
- INSTALL_POWERLINE=${WORKSPACE_INSTALL_POWERLINE}
|
||||||
- INSTALL_SUPERVISOR=${WORKSPACE_INSTALL_SUPERVISOR}
|
- INSTALL_SUPERVISOR=${WORKSPACE_INSTALL_SUPERVISOR}
|
||||||
- INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
|
- INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
|
||||||
|
- INSTALL_WKHTMLTOPDF=${WORKSPACE_INSTALL_WKHTMLTOPDF}
|
||||||
- INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
|
- INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
|
||||||
- http_proxy
|
- http_proxy
|
||||||
- https_proxy
|
- https_proxy
|
||||||
@ -217,6 +218,7 @@ services:
|
|||||||
- INSTALL_PCNTL=${PHP_FPM_INSTALL_PCNTL}
|
- INSTALL_PCNTL=${PHP_FPM_INSTALL_PCNTL}
|
||||||
- ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
|
- ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
|
||||||
- INSTALL_FFMPEG=${PHP_FPM_FFMPEG}
|
- INSTALL_FFMPEG=${PHP_FPM_FFMPEG}
|
||||||
|
- INSTALL_WKHTMLTOPDF=${PHP_FPM_INSTALL_WKHTMLTOPDF}
|
||||||
- INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
|
- INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
|
||||||
- PUID=${PHP_FPM_PUID}
|
- PUID=${PHP_FPM_PUID}
|
||||||
- PGID=${PHP_FPM_PGID}
|
- PGID=${PHP_FPM_PGID}
|
||||||
|
@ -155,6 +155,7 @@ WORKSPACE_CHROME_DRIVER_VERSION=2.42
|
|||||||
WORKSPACE_TIMEZONE=UTC
|
WORKSPACE_TIMEZONE=UTC
|
||||||
WORKSPACE_SSH_PORT=2222
|
WORKSPACE_SSH_PORT=2222
|
||||||
WORKSPACE_INSTALL_FFMPEG=false
|
WORKSPACE_INSTALL_FFMPEG=false
|
||||||
|
WORKSPACE_INSTALL_WKHTMLTOPDF=false
|
||||||
WORKSPACE_INSTALL_GNU_PARALLEL=false
|
WORKSPACE_INSTALL_GNU_PARALLEL=false
|
||||||
WORKSPACE_INSTALL_AST=true
|
WORKSPACE_INSTALL_AST=true
|
||||||
WORKSPACE_AST_VERSION=1.0.3
|
WORKSPACE_AST_VERSION=1.0.3
|
||||||
@ -210,6 +211,7 @@ PHP_FPM_INSTALL_MYSQL_CLIENT=false
|
|||||||
PHP_FPM_INSTALL_PING=false
|
PHP_FPM_INSTALL_PING=false
|
||||||
PHP_FPM_INSTALL_SSHPASS=false
|
PHP_FPM_INSTALL_SSHPASS=false
|
||||||
PHP_FPM_INSTALL_MAILPARSE=false
|
PHP_FPM_INSTALL_MAILPARSE=false
|
||||||
|
PHP_FPM_INSTALL_WKHTMLTOPDF=false
|
||||||
PHP_FPM_FFMPEG=false
|
PHP_FPM_FFMPEG=false
|
||||||
PHP_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
|
PHP_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
|
||||||
PHP_FPM_DEFAULT_LOCALE=POSIX
|
PHP_FPM_DEFAULT_LOCALE=POSIX
|
||||||
|
@ -846,6 +846,26 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
|
|||||||
apt-get -y install ffmpeg \
|
apt-get -y install ffmpeg \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# wkhtmltopdf:
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
|
ARG INSTALL_WKHTMLTOPDF=false
|
||||||
|
|
||||||
|
RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \
|
||||||
|
apt-get install -y \
|
||||||
|
libxrender1 \
|
||||||
|
libfontconfig1 \
|
||||||
|
libx11-dev \
|
||||||
|
libjpeg62 \
|
||||||
|
libxtst6 \
|
||||||
|
wget \
|
||||||
|
&& wget https://github.com/h4cc/wkhtmltopdf-amd64/blob/master/bin/wkhtmltopdf-amd64?raw=true -O /usr/local/bin/wkhtmltopdf \
|
||||||
|
&& chmod +x /usr/local/bin/wkhtmltopdf \
|
||||||
|
;fi
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# Mailparse extension:
|
# Mailparse extension:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
@ -1231,6 +1231,26 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
|
|||||||
apt-get -y install ffmpeg \
|
apt-get -y install ffmpeg \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# wkhtmltopdf:
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
|
ARG INSTALL_WKHTMLTOPDF=false
|
||||||
|
|
||||||
|
RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \
|
||||||
|
apt-get install -y \
|
||||||
|
libxrender1 \
|
||||||
|
libfontconfig1 \
|
||||||
|
libx11-dev \
|
||||||
|
libjpeg62 \
|
||||||
|
libxtst6 \
|
||||||
|
wget \
|
||||||
|
&& wget https://github.com/h4cc/wkhtmltopdf-amd64/blob/master/bin/wkhtmltopdf-amd64?raw=true -O /usr/local/bin/wkhtmltopdf \
|
||||||
|
&& chmod +x /usr/local/bin/wkhtmltopdf \
|
||||||
|
;fi
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# Mailparse extension:
|
# Mailparse extension:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
Loading…
Reference in New Issue
Block a user