Merge pull request #1088 from q0rban/1087-8.0-pear

Configure PHP with pear/pecl installers for PHP 8.0
docker-library · Nov 24, 2020 · cf3943e · cf3943e
2 parents 470ab97 + 03a9fae
commit cf3943e
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 14 deletions.
diff --git a/7.4/alpine3.11/cli/Dockerfile b/7.4/alpine3.11/cli/Dockerfile
diff --git a/7.4/alpine3.11/fpm/Dockerfile b/7.4/alpine3.11/fpm/Dockerfile
diff --git a/7.4/alpine3.11/zts/Dockerfile b/7.4/alpine3.11/zts/Dockerfile
diff --git a/7.4/alpine3.12/cli/Dockerfile b/7.4/alpine3.12/cli/Dockerfile
diff --git a/7.4/alpine3.12/fpm/Dockerfile b/7.4/alpine3.12/fpm/Dockerfile
diff --git a/7.4/alpine3.12/zts/Dockerfile b/7.4/alpine3.12/zts/Dockerfile
diff --git a/7.4/buster/apache/Dockerfile b/7.4/buster/apache/Dockerfile
diff --git a/7.4/buster/cli/Dockerfile b/7.4/buster/cli/Dockerfile
diff --git a/7.4/buster/fpm/Dockerfile b/7.4/buster/fpm/Dockerfile
diff --git a/7.4/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile
diff --git a/8.0-rc/alpine3.12/cli/Dockerfile b/8.0-rc/alpine3.12/cli/Dockerfile
diff --git a/8.0-rc/alpine3.12/fpm/Dockerfile b/8.0-rc/alpine3.12/fpm/Dockerfile
diff --git a/8.0-rc/buster/apache/Dockerfile b/8.0-rc/buster/apache/Dockerfile
diff --git a/8.0-rc/buster/cli/Dockerfile b/8.0-rc/buster/cli/Dockerfile
diff --git a/8.0-rc/buster/fpm/Dockerfile b/8.0-rc/buster/fpm/Dockerfile
diff --git a/8.0-rc/buster/zts/Dockerfile b/8.0-rc/buster/zts/Dockerfile
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -155,9 +155,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-{{ if (.version | version_id) | . >= ("7.4" | version_id) and . < ("8" | version_id) then ( -}}
+{{ if (.version | version_id) | . >= ("7.4" | version_id) then ( -}}
 # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
-# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 {{ ) else "" end -}}

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -184,9 +184,8 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
-{{ if (.version | version_id) | . >= ("7.4" | version_id) and . < ("8" | version_id) then ( -}}
+{{ if (.version | version_id) | . >= ("7.4" | version_id) then ( -}}
 # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
-# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229
 		--with-pear \
 		\
 {{ ) else "" end -}}