Skip to content

Commit eddb30e

Browse files
yosifkityosifkit
authored
Merge pull request #649 from Baldinof/cgi_in_cli_variant
Enable CGI for CLI variant
2 parents 2fa5427 + cff4da8 commit eddb30e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+34
-124
lines changed

‎5.6/alpine3.7/cli/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ RUN set -xe \
116116
# make sure invalid --configure-flags are fatal errors intead of just warnings
117117
--enable-option-checking=fatal \
118118
\
119-
--disable-cgi \
120-
\
121119
# https://github.com/docker-library/php/issues/439
122120
--with-mhash \
123121
\

‎5.6/alpine3.7/fpm/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
4141
RUN mkdir -p $PHP_INI_DIR/conf.d
4242

4343
##<autogenerated>##
44-
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
44+
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
4545
##</autogenerated>##
4646

4747
# Apply stack smash protection to functions using local buffers and alloca()
@@ -117,8 +117,6 @@ RUN set -xe \
117117
# make sure invalid --configure-flags are fatal errors intead of just warnings
118118
--enable-option-checking=fatal \
119119
\
120-
--disable-cgi \
121-
\
122120
# https://github.com/docker-library/php/issues/439
123121
--with-mhash \
124122
\

‎5.6/alpine3.7/zts/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
4141
RUN mkdir -p $PHP_INI_DIR/conf.d
4242

4343
##<autogenerated>##
44-
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
44+
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
4545
##</autogenerated>##
4646

4747
# Apply stack smash protection to functions using local buffers and alloca()
@@ -117,8 +117,6 @@ RUN set -xe \
117117
# make sure invalid --configure-flags are fatal errors intead of just warnings
118118
--enable-option-checking=fatal \
119119
\
120-
--disable-cgi \
121-
\
122120
# https://github.com/docker-library/php/issues/439
123121
--with-mhash \
124122
\

‎5.6/jessie/apache/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RUN { \
9898
&& a2enconf docker-php
9999

100100
ENV PHP_EXTRA_BUILD_DEPS apache2-dev
101-
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
101+
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
102102
##</autogenerated>##
103103

104104
# Apply stack smash protection to functions using local buffers and alloca()
@@ -194,8 +194,6 @@ RUN set -eux; \
194194
# make sure invalid --configure-flags are fatal errors intead of just warnings
195195
--enable-option-checking=fatal \
196196
\
197-
--disable-cgi \
198-
\
199197
# https://github.com/docker-library/php/issues/439
200198
--with-mhash \
201199
\

‎5.6/jessie/cli/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ RUN set -eux; \
135135
# make sure invalid --configure-flags are fatal errors intead of just warnings
136136
--enable-option-checking=fatal \
137137
\
138-
--disable-cgi \
139-
\
140138
# https://github.com/docker-library/php/issues/439
141139
--with-mhash \
142140
\

‎5.6/jessie/fpm/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
4040
RUN mkdir -p $PHP_INI_DIR/conf.d
4141

4242
##<autogenerated>##
43-
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
43+
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
4444
##</autogenerated>##
4545

4646
# Apply stack smash protection to functions using local buffers and alloca()
@@ -136,8 +136,6 @@ RUN set -eux; \
136136
# make sure invalid --configure-flags are fatal errors intead of just warnings
137137
--enable-option-checking=fatal \
138138
\
139-
--disable-cgi \
140-
\
141139
# https://github.com/docker-library/php/issues/439
142140
--with-mhash \
143141
\

‎5.6/jessie/zts/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
4040
RUN mkdir -p $PHP_INI_DIR/conf.d
4141

4242
##<autogenerated>##
43-
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
43+
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
4444
##</autogenerated>##
4545

4646
# Apply stack smash protection to functions using local buffers and alloca()
@@ -136,8 +136,6 @@ RUN set -eux; \
136136
# make sure invalid --configure-flags are fatal errors intead of just warnings
137137
--enable-option-checking=fatal \
138138
\
139-
--disable-cgi \
140-
\
141139
# https://github.com/docker-library/php/issues/439
142140
--with-mhash \
143141
\

‎5.6/stretch/apache/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RUN { \
9898
&& a2enconf docker-php
9999

100100
ENV PHP_EXTRA_BUILD_DEPS apache2-dev
101-
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
101+
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
102102
##</autogenerated>##
103103

104104
# Apply stack smash protection to functions using local buffers and alloca()
@@ -194,8 +194,6 @@ RUN set -eux; \
194194
# make sure invalid --configure-flags are fatal errors intead of just warnings
195195
--enable-option-checking=fatal \
196196
\
197-
--disable-cgi \
198-
\
199197
# https://github.com/docker-library/php/issues/439
200198
--with-mhash \
201199
\

‎5.6/stretch/cli/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ RUN set -eux; \
135135
# make sure invalid --configure-flags are fatal errors intead of just warnings
136136
--enable-option-checking=fatal \
137137
\
138-
--disable-cgi \
139-
\
140138
# https://github.com/docker-library/php/issues/439
141139
--with-mhash \
142140
\

‎5.6/stretch/fpm/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
4040
RUN mkdir -p $PHP_INI_DIR/conf.d
4141

4242
##<autogenerated>##
43-
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
43+
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi
4444
##</autogenerated>##
4545

4646
# Apply stack smash protection to functions using local buffers and alloca()
@@ -136,8 +136,6 @@ RUN set -eux; \
136136
# make sure invalid --configure-flags are fatal errors intead of just warnings
137137
--enable-option-checking=fatal \
138138
\
139-
--disable-cgi \
140-
\
141139
# https://github.com/docker-library/php/issues/439
142140
--with-mhash \
143141
\

0 commit comments

Comments
 (0)