diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index 1162334f3..2ab6eb1eb 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile index e015a3d32..ef9f91d55 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile index 22c4cd536..316cb741b 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile index 688a6dbe4..318631d2e 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile index 555dc1cec..8da359c32 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile index 7c7e9f0ce..e0a094ea3 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile index c452ebe53..d99d58b13 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile index a1b7f717f..ad59bb69f 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile index 11a6fcb0b..f25d0fe76 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile index cf946d345..b9e67bd5d 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile index b423e6229..efe917849 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile index cf927718c..c0d149146 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -6,15 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index 4213667f4..cf11843cf 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -6,15 +6,6 @@ FROM debian:stretch-slim -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index cab3279fb..e41dbf006 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -6,15 +6,6 @@ FROM debian:stretch-slim -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index 20de860da..c3bca4d99 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -6,15 +6,6 @@ FROM debian:stretch-slim -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index d932c31e8..92d77f486 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -6,15 +6,6 @@ FROM debian:stretch-slim -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 65963806f..86ddbd07c 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,14 +1,5 @@ FROM debian:%%DEBIAN_SUITE%% -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - # persistent / runtime deps ENV PHPIZE_DEPS \ autoconf \