Enable cgi bin for cli variant

Baldinof · tianon · commit c14ef6c61b20 · 2018-06-11T14:08:44.000-07:00
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -111,8 +111,6 @@ RUN set -xe \
 # 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
 		--with-mhash \
 		\
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -131,8 +131,6 @@ RUN set -eux; \
 # 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
 		--with-mhash \
 		\
diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1
@@ -56,4 +56,4 @@ RUN { \
 	&& a2enconf docker-php
 
 ENV PHP_EXTRA_BUILD_DEPS apache2-dev
-ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
+ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
diff --git a/fpm-Dockerfile-block-1 b/fpm-Dockerfile-block-1
@@ -1 +1 @@
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
+ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
diff --git a/zts-Dockerfile-block-1 b/zts-Dockerfile-block-1
@@ -1 +1 @@
-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
+ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,6 @@ RUN set -xe \`
`111`	`111`	`# make sure invalid --configure-flags are fatal errors intead of just warnings`
`112`	`112`	`--enable-option-checking=fatal \`
`113`	`113`	`\`
`114`		`- --disable-cgi \`
`115`		`- \`
`116`	`114`	`# https://github.com/docker-library/php/issues/439`
`117`	`115`	`--with-mhash \`
`118`	`116`	`\`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,6 @@ RUN set -eux; \`
`131`	`131`	`# make sure invalid --configure-flags are fatal errors intead of just warnings`
`132`	`132`	`--enable-option-checking=fatal \`
`133`	`133`	`\`
`134`		`- --disable-cgi \`
`135`		`- \`
`136`	`134`	`# https://github.com/docker-library/php/issues/439`
`137`	`135`	`--with-mhash \`
`138`	`136`	`\`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data`
	`1`	`+ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi`