From 39469e1404172d2d833b9eb9f0fb4665624815df Mon Sep 17 00:00:00 2001
From: vladyslavstartsev <vladronaldo7@gmail.com>
Date: Tue, 28 Aug 2018 09:16:25 +0300
Subject: [PATCH] added ssh2 to workspace and php-fpm (#1756)

---
 docker-compose.yml   |  2 ++
 env-example          |  2 ++
 php-fpm/Dockerfile   | 17 +++++++++++++++++
 workspace/Dockerfile | 13 +++++++++++++
 4 files changed, 34 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 920f57d..61f261b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,6 +52,7 @@ services:
           - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
           - INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
           - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
+          - INSTALL_SSH2=${WORKSPACE_INSTALL_SSH2}
           - INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
           - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
           - INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
@@ -120,6 +121,7 @@ services:
           - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
           - INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
           - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
+          - INSTALL_SSH2=${PHP_FPM_INSTALL_SSH2}
           - INSTALL_SOAP=${PHP_FPM_INSTALL_SOAP}
           - INSTALL_IMAP=${PHP_FPM_INSTALL_IMAP}
           - INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
diff --git a/env-example b/env-example
index c851395..6089cdc 100644
--- a/env-example
+++ b/env-example
@@ -88,6 +88,7 @@ WORKSPACE_INSTALL_WORKSPACE_SSH=false
 WORKSPACE_INSTALL_SUBVERSION=false
 WORKSPACE_INSTALL_XDEBUG=false
 WORKSPACE_INSTALL_PHPDBG=false
+WORKSPACE_INSTALL_SSH2=false
 WORKSPACE_INSTALL_LDAP=false
 WORKSPACE_INSTALL_GMP=false
 WORKSPACE_INSTALL_SOAP=false
@@ -139,6 +140,7 @@ PHP_FPM_INSTALL_IMAP=false
 PHP_FPM_INSTALL_MONGO=false
 PHP_FPM_INSTALL_AMQP=false
 PHP_FPM_INSTALL_MSSQL=false
+PHP_FPM_INSTALL_SSH2=false
 PHP_FPM_INSTALL_SOAP=false
 PHP_FPM_INSTALL_GMP=false
 PHP_FPM_INSTALL_EXIF=false
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 7158680..e1b4c45 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -50,6 +50,23 @@ RUN apt-get update -yqq && \
 #   - 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:
 ###########################################################################
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 0030d95..37f1fb1 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -174,6 +174,19 @@ RUN if [ ${INSTALL_DRUSH} = true ]; then \
     drush core-status \
 ;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:
 ###########################################################################