From deb4a80b409c21ecdd2b884142fab51b48a9b3cb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 30 Nov 2020 10:04:30 -0800 Subject: [PATCH] Keep "pecl update-channels" for 8.0 also --- 8.0/alpine3.12/cli/Dockerfile | 4 ++++ 8.0/alpine3.12/fpm/Dockerfile | 4 ++++ 8.0/buster/apache/Dockerfile | 4 ++++ 8.0/buster/cli/Dockerfile | 4 ++++ 8.0/buster/fpm/Dockerfile | 4 ++++ 8.0/buster/zts/Dockerfile | 4 ++++ Dockerfile-alpine.template | 2 -- Dockerfile-debian.template | 2 -- 8 files changed, 24 insertions(+), 4 deletions(-) diff --git a/8.0/alpine3.12/cli/Dockerfile b/8.0/alpine3.12/cli/Dockerfile index eaeed288..a5a78498 100644 --- a/8.0/alpine3.12/cli/Dockerfile +++ b/8.0/alpine3.12/cli/Dockerfile @@ -176,6 +176,10 @@ RUN set -eux; \ \ apk del --no-network .build-deps; \ \ +# update pecl channel definitions https://github.com/docker-library/php/issues/443 + pecl update-channels; \ + rm -rf /tmp/pear ~/.pearrc; \ + \ # smoke test php --version diff --git a/8.0/alpine3.12/fpm/Dockerfile b/8.0/alpine3.12/fpm/Dockerfile index a5f2b5e2..ee79340a 100644 --- a/8.0/alpine3.12/fpm/Dockerfile +++ b/8.0/alpine3.12/fpm/Dockerfile @@ -178,6 +178,10 @@ RUN set -eux; \ \ apk del --no-network .build-deps; \ \ +# update pecl channel definitions https://github.com/docker-library/php/issues/443 + pecl update-channels; \ + rm -rf /tmp/pear ~/.pearrc; \ + \ # smoke test php --version diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile index 912f89dc..a934bdd6 100644 --- a/8.0/buster/apache/Dockerfile +++ b/8.0/buster/apache/Dockerfile @@ -257,6 +257,10 @@ RUN set -eux; \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ +# update pecl channel definitions https://github.com/docker-library/php/issues/443 + pecl update-channels; \ + rm -rf /tmp/pear ~/.pearrc; \ + \ # smoke test php --version diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile index 28b20cd9..24809ceb 100644 --- a/8.0/buster/cli/Dockerfile +++ b/8.0/buster/cli/Dockerfile @@ -196,6 +196,10 @@ RUN set -eux; \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ +# update pecl channel definitions https://github.com/docker-library/php/issues/443 + pecl update-channels; \ + rm -rf /tmp/pear ~/.pearrc; \ + \ # smoke test php --version diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index 59fa3110..4290941b 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -198,6 +198,10 @@ RUN set -eux; \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ +# update pecl channel definitions https://github.com/docker-library/php/issues/443 + pecl update-channels; \ + rm -rf /tmp/pear ~/.pearrc; \ + \ # smoke test php --version diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index 682dc61d..ca62ac69 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -198,6 +198,10 @@ RUN set -eux; \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ +# update pecl channel definitions https://github.com/docker-library/php/issues/443 + pecl update-channels; \ + rm -rf /tmp/pear ~/.pearrc; \ + \ # smoke test php --version diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 54d7ea16..18aba897 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -188,12 +188,10 @@ RUN set -eux; \ \ apk del --no-network .build-deps; \ \ -{{ if (.version | version_id) < ("8" | version_id) then ( -}} # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ rm -rf /tmp/pear ~/.pearrc; \ \ -{{ ) else "" end -}} # smoke test php --version diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 87ea3c74..a4e36ddd 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -221,12 +221,10 @@ RUN set -eux; \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ -{{ if (.version | version_id) < ("8" | version_id) then ( -}} # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ rm -rf /tmp/pear ~/.pearrc; \ \ -{{ ) else "" end -}} # smoke test php --version