Skip to content

Commit

Permalink
Merge pull request #649 from Baldinof/cgi_in_cli_variant
Browse files Browse the repository at this point in the history 
Enable CGI for CLI variant
  • Loading branch information
@yosifkit
yosifkit committed Jun 11, 2018
2 parents 2fa5427 + cff4da8 commit eddb30e
Show file tree
Hide file tree
Showing 48 changed files with 34 additions and 124 deletions.
2 changes: 0 additions & 2 deletions 5.6/alpine3.7/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 5.6/alpine3.7/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -117,8 +117,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 5.6/alpine3.7/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -117,8 +117,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 5.6/jessie/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ 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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -194,8 +194,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 \
\
Expand Down
2 changes: 0 additions & 2 deletions 5.6/jessie/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 5.6/jessie/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -136,8 +136,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 5.6/jessie/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -136,8 +136,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 5.6/stretch/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ 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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -194,8 +194,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 \
\
Expand Down
2 changes: 0 additions & 2 deletions 5.6/stretch/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 5.6/stretch/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -136,8 +136,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 5.6/stretch/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -136,8 +136,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 \
\
Expand Down
2 changes: 0 additions & 2 deletions 7.0/alpine3.7/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.0/alpine3.7/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -117,8 +117,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.0/alpine3.7/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -117,8 +117,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.0/jessie/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ 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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -194,8 +194,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 \
\
Expand Down
2 changes: 0 additions & 2 deletions 7.0/jessie/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.0/jessie/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -136,8 +136,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.0/jessie/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -136,8 +136,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.0/stretch/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ 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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -194,8 +194,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 \
\
Expand Down
2 changes: 0 additions & 2 deletions 7.0/stretch/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.0/stretch/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -136,8 +136,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.0/stretch/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -136,8 +136,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 \
\
Expand Down
2 changes: 0 additions & 2 deletions 7.1/alpine3.7/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.1/alpine3.7/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
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
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -117,8 +117,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 \
\
Expand Down
4 changes: 1 addition & 3 deletions 7.1/alpine3.7/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV PHP_INI_DIR /usr/local/etc/php
RUN mkdir -p $PHP_INI_DIR/conf.d

##<autogenerated>##
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
##</autogenerated>##

# Apply stack smash protection to functions using local buffers and alloca()
Expand Down Expand Up @@ -117,8 +117,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 \
\
Expand Down
Loading

0 comments on commit eddb30e

Please sign in to comment.