From d23c64ea2bb564ef10ce7d4a41e51ac3ba433815 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Sun, 31 Dec 2017 13:02:02 -0500 Subject: [PATCH 1/3] Revert "Remove errant extra space character" This reverts commit 6677546d599d3980781b520f84d03ecaad291dd1. --- 5.6/jessie/apache/Dockerfile | 2 +- 5.6/jessie/cli/Dockerfile | 2 +- 5.6/jessie/fpm/Dockerfile | 2 +- 5.6/jessie/zts/Dockerfile | 2 +- 7.0/jessie/apache/Dockerfile | 2 +- 7.0/jessie/cli/Dockerfile | 2 +- 7.0/jessie/fpm/Dockerfile | 2 +- 7.0/jessie/zts/Dockerfile | 2 +- 7.1/jessie/apache/Dockerfile | 2 +- 7.1/jessie/cli/Dockerfile | 2 +- 7.1/jessie/fpm/Dockerfile | 2 +- 7.1/jessie/zts/Dockerfile | 2 +- 7.2/stretch/apache/Dockerfile | 2 +- 7.2/stretch/cli/Dockerfile | 2 +- 7.2/stretch/fpm/Dockerfile | 2 +- 7.2/stretch/zts/Dockerfile | 2 +- Dockerfile-debian.template | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index 1162334f3..67f1bc5f4 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile index e015a3d32..50178f41b 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile index 22c4cd536..b9fcbb930 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile index 688a6dbe4..ede4ad481 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile index 555dc1cec..11485eeef 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile index 7c7e9f0ce..ea2793f76 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile index c452ebe53..d6218d1ee 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile index a1b7f717f..0b1ae36dc 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile index 11a6fcb0b..caf0968a4 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile index cf946d345..f52555e99 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile index b423e6229..d213d1d72 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile index cf927718c..64bf8e29f 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -11,7 +11,7 @@ FROM debian:jessie RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index 4213667f4..c2b645000 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -11,7 +11,7 @@ FROM debian:stretch-slim RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index cab3279fb..183180d99 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -11,7 +11,7 @@ FROM debian:stretch-slim RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index 20de860da..d887e71d2 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -11,7 +11,7 @@ FROM debian:stretch-slim RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index d932c31e8..295af24dc 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -11,7 +11,7 @@ FROM debian:stretch-slim RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 65963806f..a0931810f 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -5,7 +5,7 @@ FROM debian:%%DEBIAN_SUITE%% RUN set -eux; \ { \ echo 'Package: php*'; \ - echo 'Pin: release *'; \ + echo 'Pin: release *'; \ echo 'Pin-Priority: -1'; \ } > /etc/apt/preferences.d/no-debian-php From 8bdd6d9d5f9f688f2a648c3e26a67f439b300693 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Sun, 31 Dec 2017 13:02:11 -0500 Subject: [PATCH 2/3] Revert "Add a link to the PR for future travellers" This reverts commit 9596aeb3580b2f151703c94217eb0bf4517ecee4. --- 5.6/jessie/apache/Dockerfile | 1 - 5.6/jessie/cli/Dockerfile | 1 - 5.6/jessie/fpm/Dockerfile | 1 - 5.6/jessie/zts/Dockerfile | 1 - 7.0/jessie/apache/Dockerfile | 1 - 7.0/jessie/cli/Dockerfile | 1 - 7.0/jessie/fpm/Dockerfile | 1 - 7.0/jessie/zts/Dockerfile | 1 - 7.1/jessie/apache/Dockerfile | 1 - 7.1/jessie/cli/Dockerfile | 1 - 7.1/jessie/fpm/Dockerfile | 1 - 7.1/jessie/zts/Dockerfile | 1 - 7.2/stretch/apache/Dockerfile | 1 - 7.2/stretch/cli/Dockerfile | 1 - 7.2/stretch/fpm/Dockerfile | 1 - 7.2/stretch/zts/Dockerfile | 1 - Dockerfile-debian.template | 1 - 17 files changed, 17 deletions(-) diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index 67f1bc5f4..63d3f33c8 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile index 50178f41b..1eb8d63f6 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile index b9fcbb930..1097944a8 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile index ede4ad481..63a2507eb 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile index 11485eeef..079391b50 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile index ea2793f76..8d08b4ff8 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile index d6218d1ee..c61d9bcdd 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile index 0b1ae36dc..93e930ff3 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile index caf0968a4..5a5fad4e0 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile index f52555e99..e177805c5 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile index d213d1d72..68b082b0a 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile index 64bf8e29f..fbc13f066 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index c2b645000..dbdae65a0 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index 183180d99..e2b8b1ad5 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index d887e71d2..81cbf58a2 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index 295af24dc..f7a0d4de7 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -7,7 +7,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*'; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index a0931810f..878ab45d1 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,7 +1,6 @@ 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*'; \ From 7f29f4b3c894c996d9ebb3edd0c9c394baabcdc9 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Sun, 31 Dec 2017 13:02:21 -0500 Subject: [PATCH 3/3] Revert "Block the installation of Debian's PHP packages" This reverts commit dbd5d1e03d12d6405b0f7bd82623c4410679701e. --- 5.6/jessie/apache/Dockerfile | 8 -------- 5.6/jessie/cli/Dockerfile | 8 -------- 5.6/jessie/fpm/Dockerfile | 8 -------- 5.6/jessie/zts/Dockerfile | 8 -------- 7.0/jessie/apache/Dockerfile | 8 -------- 7.0/jessie/cli/Dockerfile | 8 -------- 7.0/jessie/fpm/Dockerfile | 8 -------- 7.0/jessie/zts/Dockerfile | 8 -------- 7.1/jessie/apache/Dockerfile | 8 -------- 7.1/jessie/cli/Dockerfile | 8 -------- 7.1/jessie/fpm/Dockerfile | 8 -------- 7.1/jessie/zts/Dockerfile | 8 -------- 7.2/stretch/apache/Dockerfile | 8 -------- 7.2/stretch/cli/Dockerfile | 8 -------- 7.2/stretch/fpm/Dockerfile | 8 -------- 7.2/stretch/zts/Dockerfile | 8 -------- Dockerfile-debian.template | 8 -------- 17 files changed, 136 deletions(-) diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index 63d3f33c8..2ab6eb1eb 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 1eb8d63f6..ef9f91d55 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 1097944a8..316cb741b 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 63a2507eb..318631d2e 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 079391b50..8da359c32 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 8d08b4ff8..e0a094ea3 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 c61d9bcdd..d99d58b13 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 93e930ff3..ad59bb69f 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 5a5fad4e0..f25d0fe76 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 e177805c5..b9e67bd5d 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 68b082b0a..efe917849 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 fbc13f066..c0d149146 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -6,14 +6,6 @@ FROM debian:jessie -# prevent Debian's PHP packages from being installed -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 dbdae65a0..cf11843cf 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -6,14 +6,6 @@ FROM debian:stretch-slim -# prevent Debian's PHP packages from being installed -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 e2b8b1ad5..e41dbf006 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -6,14 +6,6 @@ FROM debian:stretch-slim -# prevent Debian's PHP packages from being installed -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 81cbf58a2..c3bca4d99 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -6,14 +6,6 @@ FROM debian:stretch-slim -# prevent Debian's PHP packages from being installed -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 f7a0d4de7..92d77f486 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -6,14 +6,6 @@ FROM debian:stretch-slim -# prevent Debian's PHP packages from being installed -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 878ab45d1..86ddbd07c 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,13 +1,5 @@ FROM debian:%%DEBIAN_SUITE%% -# prevent Debian's PHP packages from being installed -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 \