Apply minor changes to non 7.4 versions to make deleting lines easier for 7.4

7.1/alpine3.8/cli/Dockerfile

@@ -165,9 +165,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/alpine3.8/fpm/Dockerfile

@@ -166,9 +166,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/alpine3.8/zts/Dockerfile

@@ -166,9 +166,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/alpine3.9/cli/Dockerfile

@@ -165,9 +165,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/alpine3.9/fpm/Dockerfile

@@ -166,9 +166,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/alpine3.9/zts/Dockerfile

@@ -166,9 +166,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/jessie/apache/Dockerfile

@@ -249,11 +249,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/jessie/cli/Dockerfile

@@ -189,11 +189,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/jessie/fpm/Dockerfile

@@ -190,11 +190,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/jessie/zts/Dockerfile

@@ -190,11 +190,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/stretch/apache/Dockerfile

@@ -249,11 +249,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/stretch/cli/Dockerfile

@@ -189,11 +189,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/stretch/fpm/Dockerfile

@@ -190,11 +190,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.1/stretch/zts/Dockerfile

@@ -190,11 +190,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/alpine3.8/cli/Dockerfile

@@ -171,9 +171,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/alpine3.8/fpm/Dockerfile

@@ -172,9 +172,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/alpine3.8/zts/Dockerfile

@@ -172,9 +172,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/alpine3.9/cli/Dockerfile

@@ -171,9 +171,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/alpine3.9/fpm/Dockerfile

@@ -172,9 +172,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/alpine3.9/zts/Dockerfile

@@ -172,9 +172,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/stretch/apache/Dockerfile

@@ -268,11 +268,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/stretch/cli/Dockerfile

@@ -208,11 +208,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/stretch/fpm/Dockerfile

@@ -209,11 +209,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.2/stretch/zts/Dockerfile

@@ -209,11 +209,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/alpine3.8/cli/Dockerfile

@@ -171,9 +171,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/alpine3.8/fpm/Dockerfile

@@ -172,9 +172,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/alpine3.8/zts/Dockerfile

@@ -172,9 +172,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/alpine3.9/cli/Dockerfile

@@ -171,9 +171,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/alpine3.9/fpm/Dockerfile

@@ -172,9 +172,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/alpine3.9/zts/Dockerfile

@@ -172,9 +172,11 @@ RUN set -xe \
 	\
 	&& apk del --no-network .build-deps \
 	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	&& pecl update-channels \
-	&& rm -rf /tmp/pear ~/.pearrc
+	&& rm -rf /tmp/pear ~/.pearrc \
+# smoke test
+	&& php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/stretch/apache/Dockerfile

@@ -268,11 +268,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/stretch/cli/Dockerfile

@@ -208,11 +208,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/stretch/fpm/Dockerfile

@@ -209,11 +209,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 

7.3/stretch/zts/Dockerfile

@@ -209,11 +209,11 @@ RUN set -eux; \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	\
-	php --version; \
-	\
-# https://github.com/docker-library/php/issues/443
+# update pecl channel definitions https://github.com/docker-library/php/issues/443
 	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc
+	rm -rf /tmp/pear ~/.pearrc; \
+# smoke test
+	php --version
 
 COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/