From fde59807ba8aa3af93d3bc251bebddba3aac9977 Mon Sep 17 00:00:00 2001 From: "[OXID-PS] Keywan Ghadami" Date: Tue, 29 Sep 2020 15:14:09 +0200 Subject: [PATCH 1/3] add php ssh support --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 522cd76..c3c5c4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,17 +2,17 @@ ARG PHP=7.1 FROM php:$PHP-apache #libs: libjudy-dev need this for memprof -ARG libs="libfreetype6 libjpeg62-turbo liblz4-tool libjudy-dev" +ARG libs="libfreetype6 libjpeg62-turbo liblz4-tool libjudy-dev libssh2-1" ARG remoteTools="rsync wget openssh-client" ARG fontTools="fontforge ttfautohint" ARG editors="less nano" ARG tools="$editors $fontTools $remoteTools python3-pip nvi iproute2 ack-grep unzip git default-mysql-client sudo make socat dnsutils iputils-ping netcat" ARG RUNTIME_PACKAGE_DEPS="$libs $tools msmtp bc locales" -ARG BUILD_PACKAGE_DEPS="libcurl4-openssl-dev libjpeg-dev libpng-dev libxml2-dev libzip-dev" +ARG BUILD_PACKAGE_DEPS="libcurl4-openssl-dev libjpeg-dev libpng-dev libxml2-dev libzip-dev libssh2-1-dev" -ARG PHP_EXT_DEPS="curl json xml mbstring zip bcmath soap pdo_mysql gd mysqli" -ARG PECL_DEPS="memprof xdebug" +ARG PHP_EXT_DEPS="curl json xml mbstring zip bcmath soap pdo_mysql gd mysqli " +ARG PECL_DEPS="memprof xdebug ssh2" ARG PHP_MEMORY_LIMIT="-1" RUN ln -s /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini From d2cd0ba98ca9b71050965547a14027e5ed66e582 Mon Sep 17 00:00:00 2001 From: "[OXID-PS] Keywan Ghadami" Date: Tue, 29 Sep 2020 15:32:33 +0200 Subject: [PATCH 2/3] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c3c5c4a..47f95cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG RUNTIME_PACKAGE_DEPS="$libs $tools msmtp bc locales" ARG BUILD_PACKAGE_DEPS="libcurl4-openssl-dev libjpeg-dev libpng-dev libxml2-dev libzip-dev libssh2-1-dev" ARG PHP_EXT_DEPS="curl json xml mbstring zip bcmath soap pdo_mysql gd mysqli " -ARG PECL_DEPS="memprof xdebug ssh2" +ARG PECL_DEPS="memprof xdebug ssh2-1.2" ARG PHP_MEMORY_LIMIT="-1" RUN ln -s /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini From 4171635c23ab5f8050552038d668c9ec7c6b74af Mon Sep 17 00:00:00 2001 From: "[OXID-PS] Keywan Ghadami" Date: Tue, 29 Sep 2020 16:27:12 +0200 Subject: [PATCH 3/3] pecl without interaction --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47f95cb..78e63b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ARG RUNTIME_PACKAGE_DEPS="$libs $tools msmtp bc locales" ARG BUILD_PACKAGE_DEPS="libcurl4-openssl-dev libjpeg-dev libpng-dev libxml2-dev libzip-dev libssh2-1-dev" ARG PHP_EXT_DEPS="curl json xml mbstring zip bcmath soap pdo_mysql gd mysqli " -ARG PECL_DEPS="memprof xdebug ssh2-1.2" +ARG PECL_DEPS="memprof ssh2-1.2" ARG PHP_MEMORY_LIMIT="-1" RUN ln -s /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini @@ -28,7 +28,7 @@ RUN apt-get update -y \ $BUILD_PACKAGE_DEPS \ && docker-php-ext-configure gd --with-jpeg-dir=/usr/local/ \ && docker-php-ext-install -j$(nproc) $PHP_EXT_DEPS \ - && pecl install $PECL_DEPS \ + && pecl install $PECL_DEPS <<<'' \ && docker-php-ext-enable $PECL_DEPS \ && docker-php-source delete \ && apt-get clean \