added ssh2 to workspace and php-fpm (#1756)
This commit is contained in:
parent
947a791ad2
commit
39469e1404
|
@ -52,6 +52,7 @@ services:
|
||||||
- INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
|
- INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
|
||||||
- INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
|
- INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
|
||||||
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
|
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
|
||||||
|
- INSTALL_SSH2=${WORKSPACE_INSTALL_SSH2}
|
||||||
- INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
|
- INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
|
||||||
- INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
|
- INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
|
||||||
- INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
|
- INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
|
||||||
|
@ -120,6 +121,7 @@ services:
|
||||||
- INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
|
- INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
|
||||||
- INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
|
- INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
|
||||||
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
|
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
|
||||||
|
- INSTALL_SSH2=${PHP_FPM_INSTALL_SSH2}
|
||||||
- INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
|
- INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
|
||||||
- INSTALL_IMAP=${PHP_FPM_INSTALL_IMAP}
|
- INSTALL_IMAP=${PHP_FPM_INSTALL_IMAP}
|
||||||
- INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
|
- INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
|
||||||
|
|
|
@ -88,6 +88,7 @@ WORKSPACE_INSTALL_WORKSPACE_SSH=false
|
||||||
WORKSPACE_INSTALL_SUBVERSION=false
|
WORKSPACE_INSTALL_SUBVERSION=false
|
||||||
WORKSPACE_INSTALL_XDEBUG=false
|
WORKSPACE_INSTALL_XDEBUG=false
|
||||||
WORKSPACE_INSTALL_PHPDBG=false
|
WORKSPACE_INSTALL_PHPDBG=false
|
||||||
|
WORKSPACE_INSTALL_SSH2=false
|
||||||
WORKSPACE_INSTALL_LDAP=false
|
WORKSPACE_INSTALL_LDAP=false
|
||||||
WORKSPACE_INSTALL_GMP=false
|
WORKSPACE_INSTALL_GMP=false
|
||||||
WORKSPACE_INSTALL_SOAP=false
|
WORKSPACE_INSTALL_SOAP=false
|
||||||
|
@ -139,6 +140,7 @@ PHP_FPM_INSTALL_IMAP=false
|
||||||
PHP_FPM_INSTALL_MONGO=false
|
PHP_FPM_INSTALL_MONGO=false
|
||||||
PHP_FPM_INSTALL_AMQP=false
|
PHP_FPM_INSTALL_AMQP=false
|
||||||
PHP_FPM_INSTALL_MSSQL=false
|
PHP_FPM_INSTALL_MSSQL=false
|
||||||
|
PHP_FPM_INSTALL_SSH2=false
|
||||||
PHP_FPM_INSTALL_SOAP=false
|
PHP_FPM_INSTALL_SOAP=false
|
||||||
PHP_FPM_INSTALL_GMP=false
|
PHP_FPM_INSTALL_GMP=false
|
||||||
PHP_FPM_INSTALL_EXIF=false
|
PHP_FPM_INSTALL_EXIF=false
|
||||||
|
|
|
@ -50,6 +50,23 @@ RUN apt-get update -yqq && \
|
||||||
# - INSTALL_ZIP_ARCHIVE=true
|
# - INSTALL_ZIP_ARCHIVE=true
|
||||||
#
|
#
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# SSH2:
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
ARG INSTALL_SSH2=false
|
||||||
|
|
||||||
|
RUN if [ ${INSTALL_SSH2} = true ]; then \
|
||||||
|
# Install the ssh2 extension
|
||||||
|
apt-get -y install libssh2-1-dev && \
|
||||||
|
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
|
||||||
|
pecl install -a ssh2-0.13; \
|
||||||
|
else \
|
||||||
|
pecl install -a ssh2-1.1.2; \
|
||||||
|
fi && \
|
||||||
|
docker-php-ext-enable ssh2 \
|
||||||
|
;fi
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# SOAP:
|
# SOAP:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
|
@ -174,6 +174,19 @@ RUN if [ ${INSTALL_DRUSH} = true ]; then \
|
||||||
drush core-status \
|
drush core-status \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# SSH2:
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
|
ARG INSTALL_SSH2=false
|
||||||
|
|
||||||
|
RUN if [ ${INSTALL_SSH2} = true ]; then \
|
||||||
|
# Install the PHP SSH2 extension
|
||||||
|
apt-get -y install libssh2-1-dev php${LARADOCK_PHP_VERSION}-ssh2 \
|
||||||
|
;fi
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# SOAP:
|
# SOAP:
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
Loading…
Reference in New Issue