Update templates.

James Sansbury · James Sansbury · commit 03a9fae33155 · 2020-11-24T09:31:47.000-05:00
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 -}}

Original file line number	Diff line number	Diff line change
`@@ -155,9 +155,8 @@ RUN set -eux; \`
`155`	`155`	`--with-openssl \`
`156`	`156`	`--with-zlib \`
`157`	`157`	`\`
`158`		`-{{ if (.version \| version_id) \| . >= ("7.4" \| version_id) and . < ("8" \| version_id) then ( -}}`
	`158`	`+{{ if (.version \| version_id) \| . >= ("7.4" \| version_id) then ( -}}`
`159`	`159`	`# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")`
`160`		`-# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229`
`161`	`160`	`--with-pear \`
`162`	`161`	`\`
`163`	`162`	`{{ ) else "" end -}}`
Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,8 @@ RUN set -eux; \`
`184`	`184`	`--with-openssl \`
`185`	`185`	`--with-zlib \`
`186`	`186`	`\`
`187`		`-{{ if (.version \| version_id) \| . >= ("7.4" \| version_id) and . < ("8" \| version_id) then ( -}}`
	`187`	`+{{ if (.version \| version_id) \| . >= ("7.4" \| version_id) then ( -}}`
`188`	`188`	`# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")`
`189`		`-# ... and are removed in PHP 8+; see also https://github.com/docker-library/php/pull/847#issuecomment-505638229`
`190`	`189`	`--with-pear \`
`191`	`190`	`\`
`192`	`191`	`{{ ) else "" end -}}`