mirror of
https://github.com/chialab/docker-php.git
synced 2026-08-24 10:13:24 -05:00
Merge pull request #26 from Chialab/issue/25-xdebug-7.2
Add PHP 7.2 dev images
This commit is contained in:
+3
-3
@@ -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}
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
+2
-2
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user