diff --git a/5.6/alpine3.7/cli/Dockerfile b/5.6/alpine3.7/cli/Dockerfile index 4e7e2c9c8..76f3e5590 100644 --- a/5.6/alpine3.7/cli/Dockerfile +++ b/5.6/alpine3.7/cli/Dockerfile @@ -141,6 +141,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/5.6/alpine3.7/fpm/Dockerfile b/5.6/alpine3.7/fpm/Dockerfile index a7bcfd112..de37b82da 100644 --- a/5.6/alpine3.7/fpm/Dockerfile +++ b/5.6/alpine3.7/fpm/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/5.6/alpine3.7/zts/Dockerfile b/5.6/alpine3.7/zts/Dockerfile index 0a3cbdc69..b7080f523 100644 --- a/5.6/alpine3.7/zts/Dockerfile +++ b/5.6/alpine3.7/zts/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/5.6/alpine3.8/cli/Dockerfile b/5.6/alpine3.8/cli/Dockerfile index 431c0b25b..1e7c652c6 100644 --- a/5.6/alpine3.8/cli/Dockerfile +++ b/5.6/alpine3.8/cli/Dockerfile @@ -141,6 +141,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/5.6/alpine3.8/fpm/Dockerfile b/5.6/alpine3.8/fpm/Dockerfile index 990d5e9c4..ce309c8d1 100644 --- a/5.6/alpine3.8/fpm/Dockerfile +++ b/5.6/alpine3.8/fpm/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/5.6/alpine3.8/zts/Dockerfile b/5.6/alpine3.8/zts/Dockerfile index ae870a950..40a4ebd84 100644 --- a/5.6/alpine3.8/zts/Dockerfile +++ b/5.6/alpine3.8/zts/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index 81a8abdaa..bf3eb18e5 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -221,6 +221,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile index 8ed9cbcfc..814045167 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -162,6 +162,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile index d27f9a78c..bbe492a4c 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile index fb1132bf8..494db682f 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/5.6/stretch/apache/Dockerfile b/5.6/stretch/apache/Dockerfile index 3d096c900..b1459cb16 100644 --- a/5.6/stretch/apache/Dockerfile +++ b/5.6/stretch/apache/Dockerfile @@ -221,6 +221,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/5.6/stretch/cli/Dockerfile b/5.6/stretch/cli/Dockerfile index 33d21bc12..5d9b0c0d0 100644 --- a/5.6/stretch/cli/Dockerfile +++ b/5.6/stretch/cli/Dockerfile @@ -162,6 +162,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/5.6/stretch/fpm/Dockerfile b/5.6/stretch/fpm/Dockerfile index 5a51ca72d..cdbda4547 100644 --- a/5.6/stretch/fpm/Dockerfile +++ b/5.6/stretch/fpm/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/5.6/stretch/zts/Dockerfile b/5.6/stretch/zts/Dockerfile index 2ce26760a..4d75f50b2 100644 --- a/5.6/stretch/zts/Dockerfile +++ b/5.6/stretch/zts/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.0/alpine3.7/cli/Dockerfile b/7.0/alpine3.7/cli/Dockerfile index 0f00be3ee..4e2f35b3b 100644 --- a/7.0/alpine3.7/cli/Dockerfile +++ b/7.0/alpine3.7/cli/Dockerfile @@ -141,6 +141,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.0/alpine3.7/fpm/Dockerfile b/7.0/alpine3.7/fpm/Dockerfile index 134c4c8a1..d26b08237 100644 --- a/7.0/alpine3.7/fpm/Dockerfile +++ b/7.0/alpine3.7/fpm/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.0/alpine3.7/zts/Dockerfile b/7.0/alpine3.7/zts/Dockerfile index 3b8979b02..279b76221 100644 --- a/7.0/alpine3.7/zts/Dockerfile +++ b/7.0/alpine3.7/zts/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile index 5c95f683f..4e3b7f000 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -221,6 +221,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile index b5bbb9fd9..31a5042af 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -162,6 +162,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile index 488f449c5..46b98e69f 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile index efbf690e5..4efea6a20 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.0/stretch/apache/Dockerfile b/7.0/stretch/apache/Dockerfile index 833c95684..a7ff533f4 100644 --- a/7.0/stretch/apache/Dockerfile +++ b/7.0/stretch/apache/Dockerfile @@ -221,6 +221,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.0/stretch/cli/Dockerfile b/7.0/stretch/cli/Dockerfile index 4a8cc9003..0c9e1b4d5 100644 --- a/7.0/stretch/cli/Dockerfile +++ b/7.0/stretch/cli/Dockerfile @@ -162,6 +162,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.0/stretch/fpm/Dockerfile b/7.0/stretch/fpm/Dockerfile index a6dde7bf5..dba2bf03a 100644 --- a/7.0/stretch/fpm/Dockerfile +++ b/7.0/stretch/fpm/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.0/stretch/zts/Dockerfile b/7.0/stretch/zts/Dockerfile index dee2db363..05bbc236b 100644 --- a/7.0/stretch/zts/Dockerfile +++ b/7.0/stretch/zts/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.1/alpine3.7/cli/Dockerfile b/7.1/alpine3.7/cli/Dockerfile index e567efcf7..74bda15da 100644 --- a/7.1/alpine3.7/cli/Dockerfile +++ b/7.1/alpine3.7/cli/Dockerfile @@ -141,6 +141,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.1/alpine3.7/fpm/Dockerfile b/7.1/alpine3.7/fpm/Dockerfile index c8157f527..1b5a75697 100644 --- a/7.1/alpine3.7/fpm/Dockerfile +++ b/7.1/alpine3.7/fpm/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.1/alpine3.7/zts/Dockerfile b/7.1/alpine3.7/zts/Dockerfile index 556dbab0e..fabb364f3 100644 --- a/7.1/alpine3.7/zts/Dockerfile +++ b/7.1/alpine3.7/zts/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.1/alpine3.8/cli/Dockerfile b/7.1/alpine3.8/cli/Dockerfile index b1fe25ffa..da7291bad 100644 --- a/7.1/alpine3.8/cli/Dockerfile +++ b/7.1/alpine3.8/cli/Dockerfile @@ -141,6 +141,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.1/alpine3.8/fpm/Dockerfile b/7.1/alpine3.8/fpm/Dockerfile index f86bf56a8..bc4928d8e 100644 --- a/7.1/alpine3.8/fpm/Dockerfile +++ b/7.1/alpine3.8/fpm/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.1/alpine3.8/zts/Dockerfile b/7.1/alpine3.8/zts/Dockerfile index 81faa431d..6be981b2f 100644 --- a/7.1/alpine3.8/zts/Dockerfile +++ b/7.1/alpine3.8/zts/Dockerfile @@ -142,6 +142,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile index 1bf96a04d..946ab128e 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -221,6 +221,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile index ca470f9c5..5fd140f37 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -162,6 +162,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile index 7945e5e3d..c05e611b5 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile index 112e04598..e06560d69 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.1/stretch/apache/Dockerfile b/7.1/stretch/apache/Dockerfile index 7698671b6..0618b6ce2 100644 --- a/7.1/stretch/apache/Dockerfile +++ b/7.1/stretch/apache/Dockerfile @@ -221,6 +221,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.1/stretch/cli/Dockerfile b/7.1/stretch/cli/Dockerfile index af0d6f9ca..5da6bc0a0 100644 --- a/7.1/stretch/cli/Dockerfile +++ b/7.1/stretch/cli/Dockerfile @@ -162,6 +162,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.1/stretch/fpm/Dockerfile b/7.1/stretch/fpm/Dockerfile index 68dcdc9ff..93a77ed62 100644 --- a/7.1/stretch/fpm/Dockerfile +++ b/7.1/stretch/fpm/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.1/stretch/zts/Dockerfile b/7.1/stretch/zts/Dockerfile index a192c154d..b6b8edad0 100644 --- a/7.1/stretch/zts/Dockerfile +++ b/7.1/stretch/zts/Dockerfile @@ -163,6 +163,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.2/alpine3.6/cli/Dockerfile b/7.2/alpine3.6/cli/Dockerfile index 631fdedc7..bc4f03fe5 100644 --- a/7.2/alpine3.6/cli/Dockerfile +++ b/7.2/alpine3.6/cli/Dockerfile @@ -144,6 +144,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/alpine3.6/fpm/Dockerfile b/7.2/alpine3.6/fpm/Dockerfile index 3c959bc1b..fc6749d29 100644 --- a/7.2/alpine3.6/fpm/Dockerfile +++ b/7.2/alpine3.6/fpm/Dockerfile @@ -145,6 +145,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/alpine3.6/zts/Dockerfile b/7.2/alpine3.6/zts/Dockerfile index 34a0b2488..72b65254a 100644 --- a/7.2/alpine3.6/zts/Dockerfile +++ b/7.2/alpine3.6/zts/Dockerfile @@ -145,6 +145,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/alpine3.7/cli/Dockerfile b/7.2/alpine3.7/cli/Dockerfile index ce7315ede..6672ff9b4 100644 --- a/7.2/alpine3.7/cli/Dockerfile +++ b/7.2/alpine3.7/cli/Dockerfile @@ -144,6 +144,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/alpine3.7/fpm/Dockerfile b/7.2/alpine3.7/fpm/Dockerfile index 0e0c0d565..1eaf27f12 100644 --- a/7.2/alpine3.7/fpm/Dockerfile +++ b/7.2/alpine3.7/fpm/Dockerfile @@ -145,6 +145,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/alpine3.7/zts/Dockerfile b/7.2/alpine3.7/zts/Dockerfile index 36c240088..ce9227391 100644 --- a/7.2/alpine3.7/zts/Dockerfile +++ b/7.2/alpine3.7/zts/Dockerfile @@ -145,6 +145,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/alpine3.8/cli/Dockerfile b/7.2/alpine3.8/cli/Dockerfile index da335003f..1001685d1 100644 --- a/7.2/alpine3.8/cli/Dockerfile +++ b/7.2/alpine3.8/cli/Dockerfile @@ -147,6 +147,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/alpine3.8/fpm/Dockerfile b/7.2/alpine3.8/fpm/Dockerfile index 50bc201ef..15be745e6 100644 --- a/7.2/alpine3.8/fpm/Dockerfile +++ b/7.2/alpine3.8/fpm/Dockerfile @@ -148,6 +148,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/alpine3.8/zts/Dockerfile b/7.2/alpine3.8/zts/Dockerfile index ebcacf51d..08afe3e46 100644 --- a/7.2/alpine3.8/zts/Dockerfile +++ b/7.2/alpine3.8/zts/Dockerfile @@ -148,6 +148,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index f8d8a18f8..8270a5527 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -240,6 +240,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index 500b41ab5..9a16476fe 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -181,6 +181,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index 41e8460ec..577efe668 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -182,6 +182,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index 6bc3ea331..90bb35456 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -182,6 +182,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.3-rc/alpine3.8/cli/Dockerfile b/7.3-rc/alpine3.8/cli/Dockerfile index 9eb9367c1..b6a12f42f 100644 --- a/7.3-rc/alpine3.8/cli/Dockerfile +++ b/7.3-rc/alpine3.8/cli/Dockerfile @@ -147,6 +147,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.3-rc/alpine3.8/fpm/Dockerfile b/7.3-rc/alpine3.8/fpm/Dockerfile index 8925a1d7c..302d2d5d2 100644 --- a/7.3-rc/alpine3.8/fpm/Dockerfile +++ b/7.3-rc/alpine3.8/fpm/Dockerfile @@ -148,6 +148,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.3-rc/alpine3.8/zts/Dockerfile b/7.3-rc/alpine3.8/zts/Dockerfile index 857c24d15..e4a1023e3 100644 --- a/7.3-rc/alpine3.8/zts/Dockerfile +++ b/7.3-rc/alpine3.8/zts/Dockerfile @@ -148,6 +148,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/7.3-rc/stretch/apache/Dockerfile b/7.3-rc/stretch/apache/Dockerfile index 7237ba3e7..bcad62ffd 100644 --- a/7.3-rc/stretch/apache/Dockerfile +++ b/7.3-rc/stretch/apache/Dockerfile @@ -240,6 +240,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.3-rc/stretch/cli/Dockerfile b/7.3-rc/stretch/cli/Dockerfile index 58c18b109..6ca06a21d 100644 --- a/7.3-rc/stretch/cli/Dockerfile +++ b/7.3-rc/stretch/cli/Dockerfile @@ -181,6 +181,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.3-rc/stretch/fpm/Dockerfile b/7.3-rc/stretch/fpm/Dockerfile index fd0c95f7d..1eb19f3cc 100644 --- a/7.3-rc/stretch/fpm/Dockerfile +++ b/7.3-rc/stretch/fpm/Dockerfile @@ -182,6 +182,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/7.3-rc/stretch/zts/Dockerfile b/7.3-rc/stretch/zts/Dockerfile index c27e01bee..e506569e6 100644 --- a/7.3-rc/stretch/zts/Dockerfile +++ b/7.3-rc/stretch/zts/Dockerfile @@ -182,6 +182,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ffa2dd2dd..a062b8589 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -141,6 +141,10 @@ RUN set -xe \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ && make clean \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + && cp -v php.ini-* "$PHP_INI_DIR/" \ + \ && cd / \ && docker-php-source delete \ \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 5b3f1ab66..b81df78a4 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -175,6 +175,10 @@ RUN set -eux; \ make install; \ find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ cd /; \ docker-php-source delete; \ \