From 4e5a142c9d89e6b5d9f3186fa86cbbd6142e8070 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Wed, 13 Nov 2019 23:08:54 +0100 Subject: [PATCH] YAML extension for php-cli (#2360) * Add 'WORKSPACE_INSTALL_YAML' variable to install php yaml extension for php-cli * Set 'INSTALL_YAML' variable to install php yaml extension for php-cli * Install yaml extension for php-cli --- docker-compose.yml | 1 + env-example | 3 ++- workspace/Dockerfile | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0bc79725..d2152543 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -110,6 +110,7 @@ services: - INSTALL_MYSQL_CLIENT=${WORKSPACE_INSTALL_MYSQL_CLIENT} - INSTALL_PING=${WORKSPACE_INSTALL_PING} - INSTALL_SSHPASS=${WORKSPACE_INSTALL_SSHPASS} + - INSTALL_YAML=${WORKSPACE_INSTALL_YAML} - INSTALL_MAILPARSE=${WORKSPACE_INSTALL_MAILPARSE} - PUID=${WORKSPACE_PUID} - PGID=${WORKSPACE_PGID} diff --git a/env-example b/env-example index 673deb0a..a52f36ef 100644 --- a/env-example +++ b/env-example @@ -140,6 +140,7 @@ WORKSPACE_INSTALL_PING=false WORKSPACE_INSTALL_SSHPASS=false WORKSPACE_INSTALL_INOTIFY=false WORKSPACE_INSTALL_FSWATCH=false +WORKSPACE_INSTALL_YAML=false WORKSPACE_INSTALL_MAILPARSE=false WORKSPACE_PUID=1000 WORKSPACE_PGID=1000 @@ -826,4 +827,4 @@ GEARMAN_MYSQL_PASSWORD_FILE= # Database to use by Gearman (Default: Gearmand) GEARMAN_MYSQL_DB=Gearmand # Table to use by Gearman (Default: gearman_queue) -GEARMAN_MYSQL_TABLE=gearman_queue \ No newline at end of file +GEARMAN_MYSQL_TABLE=gearman_queue diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 8a1d4c9d..58bd4633 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1101,6 +1101,25 @@ RUN if [ ${INSTALL_SSHPASS} = true ]; then \ apt-get -y install sshpass \ ;fi +########################################################################### +# YAML: extension for PHP-CLI +########################################################################### + +USER root + +ARG INSTALL_YAML=false + +RUN if [ ${INSTALL_YAML} = true ]; then \ + apt-get install libyaml-dev -y ; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + pecl install -a yaml-1.3.2; \ + else \ + pecl install yaml; \ + fi && \ + echo "extension=yaml.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini && \ + ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/yaml.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/35-yaml.ini \ +;fi + ########################################################################### # FFMpeg: ###########################################################################