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

yosifkit · yosifkit · commit a9f19e9df5f7 · 2019-06-14T14:04:15.000-07:00
diff --git a/7.1/alpine3.8/cli/Dockerfile b/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/
 
diff --git a/7.1/alpine3.8/fpm/Dockerfile b/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/
 
diff --git a/7.1/alpine3.8/zts/Dockerfile b/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/
 
diff --git a/7.1/alpine3.9/cli/Dockerfile b/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/
 
diff --git a/7.1/alpine3.9/fpm/Dockerfile b/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/
 
diff --git a/7.1/alpine3.9/zts/Dockerfile b/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/
 
diff --git a/7.1/jessie/apache/Dockerfile b/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/
 
diff --git a/7.1/jessie/cli/Dockerfile b/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/
 
diff --git a/7.1/jessie/fpm/Dockerfile b/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/
 
diff --git a/7.1/jessie/zts/Dockerfile b/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/
 
diff --git a/7.1/stretch/apache/Dockerfile b/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/
 
diff --git a/7.1/stretch/cli/Dockerfile b/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/
 
diff --git a/7.1/stretch/fpm/Dockerfile b/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/
 
diff --git a/7.1/stretch/zts/Dockerfile b/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/
 
diff --git a/7.2/alpine3.8/cli/Dockerfile b/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/
 
diff --git a/7.2/alpine3.8/fpm/Dockerfile b/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/
 
diff --git a/7.2/alpine3.8/zts/Dockerfile b/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/
 
diff --git a/7.2/alpine3.9/cli/Dockerfile b/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/
 
diff --git a/7.2/alpine3.9/fpm/Dockerfile b/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/
 
diff --git a/7.2/alpine3.9/zts/Dockerfile b/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/
 
diff --git a/7.2/stretch/apache/Dockerfile b/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/
 
diff --git a/7.2/stretch/cli/Dockerfile b/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/
 
diff --git a/7.2/stretch/fpm/Dockerfile b/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/
 
diff --git a/7.2/stretch/zts/Dockerfile b/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/
 
diff --git a/7.3/alpine3.8/cli/Dockerfile b/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/
 
diff --git a/7.3/alpine3.8/fpm/Dockerfile b/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/
 
diff --git a/7.3/alpine3.8/zts/Dockerfile b/7.3/alpine3.8/zts/Dockerfile
diff --git a/7.3/alpine3.9/cli/Dockerfile b/7.3/alpine3.9/cli/Dockerfile
diff --git a/7.3/alpine3.9/fpm/Dockerfile b/7.3/alpine3.9/fpm/Dockerfile
diff --git a/7.3/alpine3.9/zts/Dockerfile b/7.3/alpine3.9/zts/Dockerfile
diff --git a/7.3/stretch/apache/Dockerfile b/7.3/stretch/apache/Dockerfile
diff --git a/7.3/stretch/cli/Dockerfile b/7.3/stretch/cli/Dockerfile
diff --git a/7.3/stretch/fpm/Dockerfile b/7.3/stretch/fpm/Dockerfile
diff --git a/7.3/stretch/zts/Dockerfile b/7.3/stretch/zts/Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -165,9 +165,11 @@ RUN set -xe \`
`165`	`165`	`\`
`166`	`166`	`&& apk del --no-network .build-deps \`
`167`	`167`	`\`
`168`		`-# https://github.com/docker-library/php/issues/443`
	`168`	`+# update pecl channel definitions https://github.com/docker-library/php/issues/443`
`169`	`169`	`&& pecl update-channels \`
`170`		`- && rm -rf /tmp/pear ~/.pearrc`
	`170`	`+ && rm -rf /tmp/pear ~/.pearrc \`
	`171`	`+# smoke test`
	`172`	`+ && php --version`
`171`	`173`
`172`	`174`	`COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/`
`173`	`175`
Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,11 @@ RUN set -xe \`
`166`	`166`	`\`
`167`	`167`	`&& apk del --no-network .build-deps \`
`168`	`168`	`\`
`169`		`-# https://github.com/docker-library/php/issues/443`
	`169`	`+# update pecl channel definitions https://github.com/docker-library/php/issues/443`
`170`	`170`	`&& pecl update-channels \`
`171`		`- && rm -rf /tmp/pear ~/.pearrc`
	`171`	`+ && rm -rf /tmp/pear ~/.pearrc \`
	`172`	`+# smoke test`
	`173`	`+ && php --version`
`172`	`174`
`173`	`175`	`COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/`
`174`	`176`