From 27186f38d624d87d7340f279f80f3973dd0b4da5 Mon Sep 17 00:00:00 2001 From: Paolo Cuffiani Date: Wed, 10 Jan 2018 20:17:27 +0100 Subject: [PATCH 1/3] #25 feat: install XDebug on PHP 7.2 images --- .travis.yml | 6 +++--- dev/7.2/Dockerfile | 6 ++++++ dev/7.2/apache/Dockerfile | 6 ++++++ dev/7.2/fpm/Dockerfile | 6 ++++++ dev/Dockerfile | 4 ++-- dev/README.md | 3 +++ 6 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 dev/7.2/Dockerfile create mode 100644 dev/7.2/apache/Dockerfile create mode 100644 dev/7.2/fpm/Dockerfile diff --git a/.travis.yml b/.travis.yml index d05b92b..68fb395 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,9 @@ env: - VERSION=7.1 - VERSION=7.1-apache - VERSION=7.1-fpm - - VERSION=7.2 NO_DEV=1 - - VERSION=7.2-apache NO_DEV=1 - - VERSION=7.2-fpm NO_DEV=1 + - VERSION=7.2 + - VERSION=7.2-apache + - VERSION=7.2-fpm install: - travis_wait 30 make build VERSION=${VERSION} diff --git a/dev/7.2/Dockerfile b/dev/7.2/Dockerfile new file mode 100644 index 0000000..d9e35f9 --- /dev/null +++ b/dev/7.2/Dockerfile @@ -0,0 +1,6 @@ +FROM chialab/php:7.2 +MAINTAINER dev@chialab.it + +# Install XDebug. +RUN pecl install xdebug-beta \ + && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini diff --git a/dev/7.2/apache/Dockerfile b/dev/7.2/apache/Dockerfile new file mode 100644 index 0000000..f13470b --- /dev/null +++ b/dev/7.2/apache/Dockerfile @@ -0,0 +1,6 @@ +FROM chialab/php:7.2-apache +MAINTAINER dev@chialab.it + +# Install XDebug. +RUN pecl install xdebug-beta \ + && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini diff --git a/dev/7.2/fpm/Dockerfile b/dev/7.2/fpm/Dockerfile new file mode 100644 index 0000000..c6b1048 --- /dev/null +++ b/dev/7.2/fpm/Dockerfile @@ -0,0 +1,6 @@ +FROM chialab/php:7.2-fpm +MAINTAINER dev@chialab.it + +# Install XDebug. +RUN pecl install xdebug-beta \ + && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini diff --git a/dev/Dockerfile b/dev/Dockerfile index 2401477..9b9a4a2 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -1,6 +1,6 @@ -FROM chialab/php:7.1 +FROM chialab/php:latest MAINTAINER dev@chialab.it # Install XDebug. -RUN pecl install xdebug \ +RUN pecl install xdebug-beta \ && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini diff --git a/dev/README.md b/dev/README.md index d97f59d..64d335e 100644 --- a/dev/README.md +++ b/dev/README.md @@ -23,6 +23,9 @@ For more production-like environments, you might want to choose an [image *witho - [`7.1` (_dev/7.1/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.1/Dockerfile) - [`7.1-apache` (_dev/7.1/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.1/apache/Dockerfile) - [`7.1-fpm` (_dev/7.1/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.1/fpm/Dockerfile) +- [`7.2` (_dev/7.2/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/Dockerfile) +- [`7.2-apache` (_dev/7.2/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/apache/Dockerfile) +- [`7.2-fpm` (_dev/7.2/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/fpm/Dockerfile) As you might have guessed, all tags are built on top of the corresponding tag of the official image. Not all tags are supported in order to easen manteinance. From 4ee1be7d6ed7da9f11f70f9a7109e61c21f2daea Mon Sep 17 00:00:00 2001 From: Paolo Cuffiani Date: Wed, 10 Jan 2018 20:30:52 +0100 Subject: [PATCH 2/3] [minor] fix: why the hell was `php-pear` there? --- 5.4/Dockerfile | 1 - 5.5/Dockerfile | 1 - 5.6/Dockerfile | 1 - 3 files changed, 3 deletions(-) diff --git a/5.4/Dockerfile b/5.4/Dockerfile index dc76ad3..d90bac5 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -20,7 +20,6 @@ RUN buildDeps=" \ libpng12-dev \ libpq-dev \ libxml2-dev \ - php-pear \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql soap zip \ diff --git a/5.5/Dockerfile b/5.5/Dockerfile index a229612..dd45887 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -20,7 +20,6 @@ RUN buildDeps=" \ libpng12-dev \ libpq-dev \ libxml2-dev \ - php-pear \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql soap zip \ diff --git a/5.6/Dockerfile b/5.6/Dockerfile index bc62b82..de14762 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -20,7 +20,6 @@ RUN buildDeps=" \ libpng12-dev \ libpq-dev \ libxml2-dev \ - php-pear \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql soap zip \ From e25bdfe95e3c6dc7354b84f8ca762c5d59c0233b Mon Sep 17 00:00:00 2001 From: Paolo Cuffiani Date: Wed, 10 Jan 2018 21:00:22 +0100 Subject: [PATCH 3/3] [minor] test: add missing assertion on `mcrypt` for dev images --- dev/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev/Makefile b/dev/Makefile index 5c8be7f..7d280ca 100644 --- a/dev/Makefile +++ b/dev/Makefile @@ -25,6 +25,10 @@ EXTENSIONS := \ soap \ Xdebug \ zip +ifeq (,$(findstring $(PHP_VERSION), 7.2 latest)) + # Add more extensions to PHP < 7.2. + EXTENSIONS += mcrypt +endif ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 latest)) # Add more extensions to 5.x series images. EXTENSIONS += mysql