From dbd5d1e03d12d6405b0f7bd82623c4410679701e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 13 Dec 2017 16:14:37 -0800 Subject: [PATCH 1/2] Block the installation of Debian's PHP packages This will hopefully help folks with the confusion around installing packages like "php-apcu" and then wondering why they don't actually "work" (because they pull in Debian's PHP, and that's not what this image packages). --- 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 insertions(+) diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index 2ab6eb1eb3..63d3f33c81 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -6,6 +6,14 @@ 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 ef9f91d551..1eb8d63f66 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -6,6 +6,14 @@ 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 316cb741b3..1097944a89 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -6,6 +6,14 @@ 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 318631d2ed..63a2507ebd 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -6,6 +6,14 @@ 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 8da359c324..079391b506 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -6,6 +6,14 @@ 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 e0a094ea31..8d08b4ff85 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -6,6 +6,14 @@ 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 d99d58b130..c61d9bcdd1 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -6,6 +6,14 @@ 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 ad59bb69f7..93e930ff33 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -6,6 +6,14 @@ 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 f25d0fe76c..5a5fad4e0d 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -6,6 +6,14 @@ 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 b9e67bd5db..e177805c55 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -6,6 +6,14 @@ 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 efe9178499..68b082b0a9 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -6,6 +6,14 @@ 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 c0d149146a..fbc13f0660 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -6,6 +6,14 @@ 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 cf11843cf6..dbdae65a0f 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -6,6 +6,14 @@ 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 e41dbf006e..e2b8b1ad5e 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -6,6 +6,14 @@ 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 c3bca4d997..81cbf58a2d 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -6,6 +6,14 @@ 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 92d77f4861..f7a0d4de7c 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -6,6 +6,14 @@ 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 86ddbd07cd..878ab45d15 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,5 +1,13 @@ 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 \ From 9596aeb3580b2f151703c94217eb0bf4517ecee4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 13 Dec 2017 17:32:36 -0800 Subject: [PATCH 2/2] Add a link to the PR for future travellers --- 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 insertions(+) diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index 63d3f33c81..67f1bc5f4f 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -7,6 +7,7 @@ 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 1eb8d63f66..50178f41b5 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -7,6 +7,7 @@ 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 1097944a89..b9fcbb930f 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -7,6 +7,7 @@ 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 63a2507ebd..ede4ad4813 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -7,6 +7,7 @@ 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 079391b506..11485eeefb 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -7,6 +7,7 @@ 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 8d08b4ff85..ea2793f760 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -7,6 +7,7 @@ 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 c61d9bcdd1..d6218d1eef 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -7,6 +7,7 @@ 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 93e930ff33..0b1ae36dc5 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -7,6 +7,7 @@ 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 5a5fad4e0d..caf0968a4d 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -7,6 +7,7 @@ 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 e177805c55..f52555e994 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -7,6 +7,7 @@ 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 68b082b0a9..d213d1d728 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -7,6 +7,7 @@ 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 fbc13f0660..64bf8e29f8 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -7,6 +7,7 @@ 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 dbdae65a0f..c2b6450000 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -7,6 +7,7 @@ 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 e2b8b1ad5e..183180d995 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -7,6 +7,7 @@ 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 81cbf58a2d..d887e71d2c 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -7,6 +7,7 @@ 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 f7a0d4de7c..295af24dc7 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -7,6 +7,7 @@ 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 878ab45d15..a0931810f3 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,6 +1,7 @@ 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*'; \