Skip to content

Commit 3c36fc7

Browse files
authored
Merge pull request laradock#2449 from jrseliga/smb-client
Provide smbclient and php-smbclient
2 parents de57f72 + 9aecc53 commit 3c36fc7

4 files changed

Lines changed: 24 additions & 0 deletions

File tree

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ services:
7373
- INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
7474
- INSTALL_XSL=${WORKSPACE_INSTALL_XSL}
7575
- INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
76+
- INSTALL_SMB=${WORKSPACE_INSTALL_SMB}
7677
- INSTALL_IMAP=${WORKSPACE_INSTALL_IMAP}
7778
- INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
7879
- INSTALL_AMQP=${WORKSPACE_INSTALL_AMQP}
@@ -173,6 +174,7 @@ services:
173174
- INSTALL_SSH2=${PHP_FPM_INSTALL_SSH2}
174175
- INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
175176
- INSTALL_XSL=${PHP_FPM_INSTALL_XSL}
177+
- INSTALL_SMB=${PHP_FPM_INSTALL_SMB}
176178
- INSTALL_IMAP=${PHP_FPM_INSTALL_IMAP}
177179
- INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
178180
- INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}

env-example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ WORKSPACE_INSTALL_LDAP=false
108108
WORKSPACE_INSTALL_GMP=false
109109
WORKSPACE_INSTALL_SOAP=false
110110
WORKSPACE_INSTALL_XSL=false
111+
WORKSPACE_INSTALL_SMB=false
111112
WORKSPACE_INSTALL_IMAP=false
112113
WORKSPACE_INSTALL_MONGO=false
113114
WORKSPACE_INSTALL_AMQP=false
@@ -172,6 +173,7 @@ PHP_FPM_INSTALL_XDEBUG=false
172173
PHP_FPM_INSTALL_PCOV=false
173174
PHP_FPM_INSTALL_XHPROF=false
174175
PHP_FPM_INSTALL_PHPDBG=false
176+
PHP_FPM_INSTALL_SMB=false
175177
PHP_FPM_INSTALL_IMAP=false
176178
PHP_FPM_INSTALL_MONGO=false
177179
PHP_FPM_INSTALL_AMQP=false

php-fpm/Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,16 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
658658
docker-php-ext-enable imagick \
659659
;fi
660660

661+
###########################################################################
662+
# SMB:
663+
###########################################################################
664+
665+
ARG INSTALL_SMB=false
666+
667+
RUN if [ ${INSTALL_SMB} = true ]; then \
668+
apt-get install -y smbclient php-smbclient coreutils \
669+
;fi
670+
661671
###########################################################################
662672
# IMAP:
663673
###########################################################################

workspace/Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,16 @@ RUN if [ ${INSTALL_LDAP} = true ]; then \
298298
apt-get install -y php${LARADOCK_PHP_VERSION}-ldap \
299299
;fi
300300

301+
###########################################################################
302+
# SMB:
303+
###########################################################################
304+
305+
ARG INSTALL_SMB=false
306+
307+
RUN if [ ${INSTALL_SMB} = true ]; then \
308+
apt-get install -y smbclient php-smbclient coreutils \
309+
;fi
310+
301311
###########################################################################
302312
# IMAP:
303313
###########################################################################

0 commit comments

Comments
 (0)