From de138f98cdbdd70794455a9b5f20e3d90a53a3b6 Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 20 Jan 2020 16:44:15 +0100 Subject: [PATCH] - fix: (#64) loading xdebug twice --- dev/5.6/Dockerfile | 3 +-- dev/5.6/apache/Dockerfile | 3 +-- dev/5.6/fpm/Dockerfile | 3 +-- dev/7.0/Dockerfile | 3 +-- dev/7.0/apache/Dockerfile | 3 +-- dev/7.0/fpm/Dockerfile | 3 +-- dev/7.1/Dockerfile | 3 +-- dev/7.1/apache/Dockerfile | 3 +-- dev/7.1/fpm/Dockerfile | 3 +-- dev/7.2/Dockerfile | 3 +-- dev/7.2/apache/Dockerfile | 3 +-- dev/7.2/fpm/Dockerfile | 3 +-- dev/7.3/Dockerfile | 3 +-- dev/7.3/apache/Dockerfile | 3 +-- dev/7.3/fpm/Dockerfile | 3 +-- dev/7.4/Dockerfile | 3 +-- dev/7.4/apache/Dockerfile | 3 +-- dev/7.4/fpm/Dockerfile | 3 +-- dev/Dockerfile | 3 +-- 19 files changed, 19 insertions(+), 38 deletions(-) diff --git a/dev/5.6/Dockerfile b/dev/5.6/Dockerfile index 7d967cb..a18549c 100644 --- a/dev/5.6/Dockerfile +++ b/dev/5.6/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:5.6 LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/5.6/apache/Dockerfile b/dev/5.6/apache/Dockerfile index d519390..82f8247 100644 --- a/dev/5.6/apache/Dockerfile +++ b/dev/5.6/apache/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:5.6-apache LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/5.6/fpm/Dockerfile b/dev/5.6/fpm/Dockerfile index 07ae6cb..2b136cc 100644 --- a/dev/5.6/fpm/Dockerfile +++ b/dev/5.6/fpm/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:5.6-fpm LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.0/Dockerfile b/dev/7.0/Dockerfile index 8d730a9..f5c4652 100644 --- a/dev/7.0/Dockerfile +++ b/dev/7.0/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.0 LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.0/apache/Dockerfile b/dev/7.0/apache/Dockerfile index c47077a..d155793 100644 --- a/dev/7.0/apache/Dockerfile +++ b/dev/7.0/apache/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.0-apache LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.0/fpm/Dockerfile b/dev/7.0/fpm/Dockerfile index 97e5f09..30fbc59 100644 --- a/dev/7.0/fpm/Dockerfile +++ b/dev/7.0/fpm/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.0-fpm LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.1/Dockerfile b/dev/7.1/Dockerfile index 9b933d1..b0d0943 100644 --- a/dev/7.1/Dockerfile +++ b/dev/7.1/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.1 LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.1/apache/Dockerfile b/dev/7.1/apache/Dockerfile index 534df3d..0270bce 100644 --- a/dev/7.1/apache/Dockerfile +++ b/dev/7.1/apache/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.1-apache LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.1/fpm/Dockerfile b/dev/7.1/fpm/Dockerfile index 94fe73b..ad34708 100644 --- a/dev/7.1/fpm/Dockerfile +++ b/dev/7.1/fpm/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.1-fpm LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.2/Dockerfile b/dev/7.2/Dockerfile index 46415b2..e72c4ba 100644 --- a/dev/7.2/Dockerfile +++ b/dev/7.2/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.2 LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.2/apache/Dockerfile b/dev/7.2/apache/Dockerfile index 98c5dfb..b1a3b94 100644 --- a/dev/7.2/apache/Dockerfile +++ b/dev/7.2/apache/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.2-apache LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.2/fpm/Dockerfile b/dev/7.2/fpm/Dockerfile index ee56ea5..578d2ba 100644 --- a/dev/7.2/fpm/Dockerfile +++ b/dev/7.2/fpm/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.2-fpm LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.3/Dockerfile b/dev/7.3/Dockerfile index 1c9c409..ea387c4 100644 --- a/dev/7.3/Dockerfile +++ b/dev/7.3/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.3 LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.3/apache/Dockerfile b/dev/7.3/apache/Dockerfile index 571fb91..e515591 100644 --- a/dev/7.3/apache/Dockerfile +++ b/dev/7.3/apache/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.3-apache LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.3/fpm/Dockerfile b/dev/7.3/fpm/Dockerfile index a95fccc..0c955db 100644 --- a/dev/7.3/fpm/Dockerfile +++ b/dev/7.3/fpm/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.3-fpm LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.4/Dockerfile b/dev/7.4/Dockerfile index 6da9e85..c9a42e5 100644 --- a/dev/7.4/Dockerfile +++ b/dev/7.4/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.4 LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.4/apache/Dockerfile b/dev/7.4/apache/Dockerfile index 246f5c6..1e03bf4 100644 --- a/dev/7.4/apache/Dockerfile +++ b/dev/7.4/apache/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.4-apache LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/7.4/fpm/Dockerfile b/dev/7.4/fpm/Dockerfile index 6e63170..db6ad42 100644 --- a/dev/7.4/fpm/Dockerfile +++ b/dev/7.4/fpm/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:7.4-fpm LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug diff --git a/dev/Dockerfile b/dev/Dockerfile index cb014c2..05426fc 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -2,5 +2,4 @@ FROM chialab/php:latest LABEL maintainer="dev@chialab.io" # Install XDebug. -RUN install-php-extensions xdebug \ - && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini +RUN install-php-extensions xdebug