From 9aecc53dba723c7a9f110ee245218e2b673c8b3f Mon Sep 17 00:00:00 2001 From: Justin Seliga Date: Fri, 27 Dec 2019 19:34:56 -0500 Subject: [PATCH] provide smbclient and php-smbclient to php-fpm and workspace containers --- docker-compose.yml | 2 ++ env-example | 2 ++ php-fpm/Dockerfile | 10 ++++++++++ workspace/Dockerfile | 10 ++++++++++ 4 files changed, 24 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 76dacec5..fdab1416 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,6 +73,7 @@ services: - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP} - INSTALL_XSL=${WORKSPACE_INSTALL_XSL} - INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP} + - INSTALL_SMB=${WORKSPACE_INSTALL_SMB} - INSTALL_IMAP=${WORKSPACE_INSTALL_IMAP} - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO} - INSTALL_AMQP=${WORKSPACE_INSTALL_AMQP} @@ -173,6 +174,7 @@ services: - INSTALL_SSH2=${PHP_FPM_INSTALL_SSH2} - INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP} - INSTALL_XSL=${PHP_FPM_INSTALL_XSL} + - INSTALL_SMB=${PHP_FPM_INSTALL_SMB} - INSTALL_IMAP=${PHP_FPM_INSTALL_IMAP} - INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO} - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP} diff --git a/env-example b/env-example index aa5f25e0..c521fd04 100644 --- a/env-example +++ b/env-example @@ -108,6 +108,7 @@ WORKSPACE_INSTALL_LDAP=false WORKSPACE_INSTALL_GMP=false WORKSPACE_INSTALL_SOAP=false WORKSPACE_INSTALL_XSL=false +WORKSPACE_INSTALL_SMB=false WORKSPACE_INSTALL_IMAP=false WORKSPACE_INSTALL_MONGO=false WORKSPACE_INSTALL_AMQP=false @@ -172,6 +173,7 @@ PHP_FPM_INSTALL_XDEBUG=false PHP_FPM_INSTALL_PCOV=false PHP_FPM_INSTALL_XHPROF=false PHP_FPM_INSTALL_PHPDBG=false +PHP_FPM_INSTALL_SMB=false PHP_FPM_INSTALL_IMAP=false PHP_FPM_INSTALL_MONGO=false PHP_FPM_INSTALL_AMQP=false diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 559351d9..a0af2228 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -658,6 +658,16 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ docker-php-ext-enable imagick \ ;fi +########################################################################### +# SMB: +########################################################################### + +ARG INSTALL_SMB=false + +RUN if [ ${INSTALL_SMB} = true ]; then \ + apt-get install -y smbclient php-smbclient coreutils \ +;fi + ########################################################################### # IMAP: ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index a0619410..6223e0a2 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -298,6 +298,16 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \ apt-get install -y php${LARADOCK_PHP_VERSION}-ldap \ ;fi +########################################################################### +# SMB: +########################################################################### + +ARG INSTALL_SMB=false + +RUN if [ ${INSTALL_SMB} = true ]; then \ + apt-get install -y smbclient php-smbclient coreutils \ +;fi + ########################################################################### # IMAP: ###########################################################################