Update templates.

docker-library · Nov 24, 2020 · 03a9fae · 03a9fae
1 parent 0fdd2f0
commit 03a9fae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
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 -}}