Merge pull request #851 from infosiftr/with-pear

yosifkit · web-flow · commit eaa29e4a7d13 · 2019-06-26T16:45:07.000-07:00
Add "--with-pear" in 7.4
diff --git a/7.4-rc/alpine3.10/cli/Dockerfile b/7.4-rc/alpine3.10/cli/Dockerfile
@@ -144,6 +144,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -172,6 +175,9 @@ 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/7.4-rc/alpine3.10/fpm/Dockerfile b/7.4-rc/alpine3.10/fpm/Dockerfile
@@ -145,6 +145,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -173,6 +176,9 @@ 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/7.4-rc/alpine3.10/zts/Dockerfile b/7.4-rc/alpine3.10/zts/Dockerfile
@@ -145,6 +145,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -173,6 +176,9 @@ 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/7.4-rc/alpine3.9/cli/Dockerfile b/7.4-rc/alpine3.9/cli/Dockerfile
@@ -144,6 +144,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -172,6 +175,9 @@ 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/7.4-rc/alpine3.9/fpm/Dockerfile b/7.4-rc/alpine3.9/fpm/Dockerfile
@@ -145,6 +145,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -173,6 +176,9 @@ 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/7.4-rc/alpine3.9/zts/Dockerfile b/7.4-rc/alpine3.9/zts/Dockerfile
@@ -145,6 +145,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -173,6 +176,9 @@ 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/7.4-rc/stretch/apache/Dockerfile b/7.4-rc/stretch/apache/Dockerfile
@@ -234,6 +234,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -266,6 +269,9 @@ 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/7.4-rc/stretch/cli/Dockerfile b/7.4-rc/stretch/cli/Dockerfile
@@ -174,6 +174,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -206,6 +209,9 @@ 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/7.4-rc/stretch/fpm/Dockerfile b/7.4-rc/stretch/fpm/Dockerfile
@@ -175,6 +175,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -207,6 +210,9 @@ 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/7.4-rc/stretch/zts/Dockerfile b/7.4-rc/stretch/zts/Dockerfile
@@ -175,6 +175,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
@@ -207,6 +210,9 @@ 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
@@ -138,6 +138,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -168,6 +168,9 @@ RUN set -eux; \
 		--with-openssl \
 		--with-zlib \
 		\
+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494
+		--with-pear \
+		\
 # bundled pcre does not support JIT on s390x
 # https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
diff --git a/update.sh b/update.sh
@@ -165,10 +165,17 @@ for version in "${versions[@]}"; do
 				sed -ri \
 					-e '/oniguruma-dev|libonig-dev/d' \
 					"$version/$suite/$variant/Dockerfile"
-			else
-				# 7.4 and above no longer include pecl/pear: https://github.com/php/php-src/pull/3781
+			fi
+			if [ "$majorVersion" -ge '8' ]; then
+				# 8 and above no longer include pecl/pear (see https://github.com/docker-library/php/issues/846#issuecomment-505638494)
+				sed -ri \
+					-e '/pear |pearrc|pecl.*channel/d' \
+					"$version/$suite/$variant/Dockerfile"
+			fi
+			if [ "$majorVersion" != '7' ] || [ "$minorVersion" -lt '4' ]; then
+				# --with-pear is only relevant on PHP 7, and specifically only 7.4+ (see https://github.com/docker-library/php/issues/846#issuecomment-505638494)
 				sed -ri \
-					-e '\!pecl.*channel|/tmp/pear!d' \
+					-e '/--with-pear/d' \
 					"$version/$suite/$variant/Dockerfile"
 			fi
 			if [ "$majorVersion" = '7' -a "$minorVersion" -lt '2' ]; then
@@ -184,10 +191,19 @@ for version in "${versions[@]}"; do
 			fi
 
 			# remove any _extra_ blank lines created by the deletions above
-			awk '
-				NF > 0 { blank = 0 }
-				NF == 0 { ++blank }
-				blank < 2 { print }
+			gawk '
+				{
+					if (NF == 0 || (NF == 1 && $1 == "\\")) {
+						blank++
+					}
+					else {
+						blank = 0
+					}
+
+					if (blank < 2) {
+						print
+					}
+				}
 			' "$version/$suite/$variant/Dockerfile" > "$version/$suite/$variant/Dockerfile.new"
 			mv "$version/$suite/$variant/Dockerfile.new" "$version/$suite/$variant/Dockerfile"
 

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,9 @@ RUN set -eux; \`
`144`	`144`	`--with-openssl \`
`145`	`145`	`--with-zlib \`
`146`	`146`	`\`
	`147`	`+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494`
	`148`	`+ --with-pear \`
	`149`	`+ \`
`147`	`150`	`# bundled pcre does not support JIT on s390x`
`148`	`151`	`# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT`
`149`	`152`	`$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \`
`@@ -172,6 +175,9 @@ RUN set -eux; \`
`172`	`175`	`\`
`173`	`176`	`apk del --no-network .build-deps; \`
`174`	`177`	`\`
	`178`	`+# update pecl channel definitions https://github.com/docker-library/php/issues/443`
	`179`	`+ pecl update-channels; \`
	`180`	`+ rm -rf /tmp/pear ~/.pearrc; \`
`175`	`181`	`# smoke test`
`176`	`182`	`php --version`
`177`	`183`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,9 @@ RUN set -eux; \`
`145`	`145`	`--with-openssl \`
`146`	`146`	`--with-zlib \`
`147`	`147`	`\`
	`148`	`+# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") and will be removed in PHP 8+; see also https://github.com/docker-library/php/issues/846#issuecomment-505638494`
	`149`	`+ --with-pear \`
	`150`	`+ \`
`148`	`151`	`# bundled pcre does not support JIT on s390x`
`149`	`152`	`# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT`
`150`	`153`	`$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \`
`@@ -173,6 +176,9 @@ RUN set -eux; \`
`173`	`176`	`\`
`174`	`177`	`apk del --no-network .build-deps; \`
`175`	`178`	`\`
	`179`	`+# update pecl channel definitions https://github.com/docker-library/php/issues/443`
	`180`	`+ pecl update-channels; \`
	`181`	`+ rm -rf /tmp/pear ~/.pearrc; \`
`176`	`182`	`# smoke test`
`177`	`183`	`php --version`
`178`	`184`