Merge pull request #632 from infosiftr/fatal-option-checking

yosifkit · web-flow · commit 1f00ae65371a · 2018-05-01T14:10:51.000-07:00
Add "--enable-option-checking=fatal" to ./configure invocations
diff --git a/5.6/alpine3.4/cli/Dockerfile b/5.6/alpine3.4/cli/Dockerfile
@@ -112,6 +112,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/5.6/alpine3.4/fpm/Dockerfile b/5.6/alpine3.4/fpm/Dockerfile
@@ -113,6 +113,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/5.6/alpine3.4/zts/Dockerfile b/5.6/alpine3.4/zts/Dockerfile
@@ -113,6 +113,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile
@@ -191,6 +191,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile
@@ -132,6 +132,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile
@@ -133,6 +133,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile
@@ -133,6 +133,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.0/alpine3.4/cli/Dockerfile b/7.0/alpine3.4/cli/Dockerfile
@@ -112,6 +112,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.0/alpine3.4/fpm/Dockerfile b/7.0/alpine3.4/fpm/Dockerfile
@@ -113,6 +113,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.0/alpine3.4/zts/Dockerfile b/7.0/alpine3.4/zts/Dockerfile
@@ -113,6 +113,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile
@@ -191,6 +191,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile
@@ -132,6 +132,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile
@@ -133,6 +133,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile
@@ -133,6 +133,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.1/alpine3.4/cli/Dockerfile b/7.1/alpine3.4/cli/Dockerfile
@@ -112,6 +112,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.1/alpine3.4/fpm/Dockerfile b/7.1/alpine3.4/fpm/Dockerfile
@@ -113,6 +113,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.1/alpine3.4/zts/Dockerfile b/7.1/alpine3.4/zts/Dockerfile
@@ -113,6 +113,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile
@@ -191,6 +191,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile
@@ -132,6 +132,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile
@@ -133,6 +133,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile
@@ -133,6 +133,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/alpine3.6/cli/Dockerfile b/7.2/alpine3.6/cli/Dockerfile
@@ -113,6 +113,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/alpine3.6/fpm/Dockerfile b/7.2/alpine3.6/fpm/Dockerfile
@@ -114,6 +114,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/alpine3.6/zts/Dockerfile b/7.2/alpine3.6/zts/Dockerfile
@@ -114,6 +114,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/alpine3.7/cli/Dockerfile b/7.2/alpine3.7/cli/Dockerfile
@@ -113,6 +113,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/alpine3.7/fpm/Dockerfile b/7.2/alpine3.7/fpm/Dockerfile
@@ -114,6 +114,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/alpine3.7/zts/Dockerfile b/7.2/alpine3.7/zts/Dockerfile
@@ -114,6 +114,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile
@@ -193,6 +193,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile
@@ -134,6 +134,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile
@@ -135,6 +135,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile
@@ -135,6 +135,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -107,6 +107,9 @@ RUN set -xe \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -128,6 +128,9 @@ RUN set -eux; \
 		--with-config-file-path="$PHP_INI_DIR" \
 		--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
 		\
+# make sure invalid --configure-flags are fatal errors intead of just warnings
+		--enable-option-checking=fatal \
+		\
 		--disable-cgi \
 		\
 # https://github.com/docker-library/php/issues/439

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,9 @@ RUN set -xe \`
`112`	`112`	`--with-config-file-path="$PHP_INI_DIR" \`
`113`	`113`	`--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \`
`114`	`114`	`\`
	`115`	`+# make sure invalid --configure-flags are fatal errors intead of just warnings`
	`116`	`+ --enable-option-checking=fatal \`
	`117`	`+ \`
`115`	`118`	`--disable-cgi \`
`116`	`119`	`\`
`117`	`120`	`# https://github.com/docker-library/php/issues/439`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ RUN set -xe \`
`113`	`113`	`--with-config-file-path="$PHP_INI_DIR" \`
`114`	`114`	`--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \`
`115`	`115`	`\`
	`116`	`+# make sure invalid --configure-flags are fatal errors intead of just warnings`
	`117`	`+ --enable-option-checking=fatal \`
	`118`	`+ \`
`116`	`119`	`--disable-cgi \`
`117`	`120`	`\`
`118`	`121`	`# https://github.com/docker-library/php/issues/439`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,9 @@ RUN set -eux; \`
`191`	`191`	`--with-config-file-path="$PHP_INI_DIR" \`
`192`	`192`	`--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \`
`193`	`193`	`\`
	`194`	`+# make sure invalid --configure-flags are fatal errors intead of just warnings`
	`195`	`+ --enable-option-checking=fatal \`
	`196`	`+ \`
`194`	`197`	`--disable-cgi \`
`195`	`198`	`\`
`196`	`199`	`# https://github.com/docker-library/php/issues/439`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,9 @@ RUN set -eux; \`
`132`	`132`	`--with-config-file-path="$PHP_INI_DIR" \`
`133`	`133`	`--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \`
`134`	`134`	`\`
	`135`	`+# make sure invalid --configure-flags are fatal errors intead of just warnings`
	`136`	`+ --enable-option-checking=fatal \`
	`137`	`+ \`
`135`	`138`	`--disable-cgi \`
`136`	`139`	`\`
`137`	`140`	`# https://github.com/docker-library/php/issues/439`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,9 @@ RUN set -eux; \`
`133`	`133`	`--with-config-file-path="$PHP_INI_DIR" \`
`134`	`134`	`--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \`
`135`	`135`	`\`
	`136`	`+# make sure invalid --configure-flags are fatal errors intead of just warnings`
	`137`	`+ --enable-option-checking=fatal \`
	`138`	`+ \`
`136`	`139`	`--disable-cgi \`
`137`	`140`	`\`
`138`	`141`	`# https://github.com/docker-library/php/issues/439`