diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 2c6ca52086..a23c5e7879 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -61,7 +67,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -71,6 +76,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/5.5/alpine/Dockerfile b/5.5/alpine/Dockerfile index bf78e92001..bfc7ae1253 100644 --- a/5.5/alpine/Dockerfile +++ b/5.5/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -68,7 +74,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -78,6 +83,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index df7b5ee028..8d187728ee 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -29,8 +35,17 @@ RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-insta ENV APACHE_CONFDIR /etc/apache2 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars -# setup directories and permissions RUN set -ex \ + \ +# generically convert lines like +# export APACHE_RUN_USER=www-data +# into +# : ${APACHE_RUN_USER:=www-data} +# export APACHE_RUN_USER +# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...") + && sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ + \ +# setup directories and permissions && . "$APACHE_ENVVARS" \ && for dir in \ "$APACHE_LOCK_DIR" \ @@ -108,7 +123,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -118,6 +132,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index 0b4d2af47f..40d3e32215 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -62,7 +68,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -72,6 +77,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/5.5/fpm/alpine/Dockerfile b/5.5/fpm/alpine/Dockerfile index b3eaf835e1..650a830299 100644 --- a/5.5/fpm/alpine/Dockerfile +++ b/5.5/fpm/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -69,7 +75,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -79,6 +84,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/5.5/zts/Dockerfile b/5.5/zts/Dockerfile index d8cc6629c8..4b72b0c4ce 100644 --- a/5.5/zts/Dockerfile +++ b/5.5/zts/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -62,7 +68,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -72,6 +77,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/5.5/zts/alpine/Dockerfile b/5.5/zts/alpine/Dockerfile index 081e7ba10f..1c649e2abb 100644 --- a/5.5/zts/alpine/Dockerfile +++ b/5.5/zts/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -69,7 +75,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -79,6 +84,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 86404364ce..3f1bd7bc32 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -61,7 +67,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -71,6 +76,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile index aeee3d2b41..fb36fbba1a 100644 --- a/5.6/alpine/Dockerfile +++ b/5.6/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -68,7 +74,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -78,6 +83,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 44ff8365bd..c5b50c5e55 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -29,8 +35,17 @@ RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-insta ENV APACHE_CONFDIR /etc/apache2 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars -# setup directories and permissions RUN set -ex \ + \ +# generically convert lines like +# export APACHE_RUN_USER=www-data +# into +# : ${APACHE_RUN_USER:=www-data} +# export APACHE_RUN_USER +# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...") + && sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ + \ +# setup directories and permissions && . "$APACHE_ENVVARS" \ && for dir in \ "$APACHE_LOCK_DIR" \ @@ -108,7 +123,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -118,6 +132,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 950e18eda7..a6fc1787e2 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -62,7 +68,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -72,6 +77,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile index b6440657ae..6e53331cb5 100644 --- a/5.6/fpm/alpine/Dockerfile +++ b/5.6/fpm/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -69,7 +75,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -79,6 +84,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/5.6/zts/Dockerfile b/5.6/zts/Dockerfile index ce7d95e0a3..eebd731f7d 100644 --- a/5.6/zts/Dockerfile +++ b/5.6/zts/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -62,7 +68,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -72,6 +77,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile index 8f37bcd6ea..f8709c0808 100644 --- a/5.6/zts/alpine/Dockerfile +++ b/5.6/zts/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -69,7 +75,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -79,6 +84,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/7.0/Dockerfile b/7.0/Dockerfile index fe62a2c615..766d24a021 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -61,7 +67,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -71,6 +76,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile index b363cfeafb..5fc91c76cb 100644 --- a/7.0/alpine/Dockerfile +++ b/7.0/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -68,7 +74,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -78,6 +83,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index fc2b77cbd5..98f21e22e4 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -29,8 +35,17 @@ RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-insta ENV APACHE_CONFDIR /etc/apache2 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars -# setup directories and permissions RUN set -ex \ + \ +# generically convert lines like +# export APACHE_RUN_USER=www-data +# into +# : ${APACHE_RUN_USER:=www-data} +# export APACHE_RUN_USER +# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...") + && sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ + \ +# setup directories and permissions && . "$APACHE_ENVVARS" \ && for dir in \ "$APACHE_LOCK_DIR" \ @@ -108,7 +123,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -118,6 +132,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index be0bbe4340..b9654c1d0d 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -62,7 +68,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -72,6 +77,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile index 66a9322055..076fd33d43 100644 --- a/7.0/fpm/alpine/Dockerfile +++ b/7.0/fpm/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -69,7 +75,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -79,6 +84,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/7.0/zts/Dockerfile b/7.0/zts/Dockerfile index 425a00f2db..21bc54d357 100644 --- a/7.0/zts/Dockerfile +++ b/7.0/zts/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:jessie # persistent / runtime deps @@ -62,7 +68,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -72,6 +77,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile index 8f1acc37ea..308c150069 100644 --- a/7.0/zts/alpine/Dockerfile +++ b/7.0/zts/alpine/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.4 # persistent / runtime deps @@ -69,7 +75,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -79,6 +84,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 82361bf2c9..664547ab13 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -68,7 +68,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -78,6 +77,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(getconf _NPROCESSORS_ONLN)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index f341c93f69..abb4ba15df 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -61,7 +61,6 @@ RUN set -xe \ && ./configure \ --with-config-file-path="$PHP_INI_DIR" \ --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - $PHP_EXTRA_CONFIGURE_ARGS \ --disable-cgi \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ @@ -71,6 +70,7 @@ RUN set -xe \ --with-libedit \ --with-openssl \ --with-zlib \ + $PHP_EXTRA_CONFIGURE_ARGS \ && make -j"$(nproc)" \ && make install \ && { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \ diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1 index 5ca4024312..f0a1699c37 100644 --- a/apache-Dockerfile-block-1 +++ b/apache-Dockerfile-block-1 @@ -3,8 +3,17 @@ RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-insta ENV APACHE_CONFDIR /etc/apache2 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars -# setup directories and permissions RUN set -ex \ + \ +# generically convert lines like +# export APACHE_RUN_USER=www-data +# into +# : ${APACHE_RUN_USER:=www-data} +# export APACHE_RUN_USER +# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...") + && sed -r 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \ + \ +# setup directories and permissions && . "$APACHE_ENVVARS" \ && for dir in \ "$APACHE_LOCK_DIR" \ diff --git a/update.sh b/update.sh index 2f747df33a..2b5eadb4f0 100755 --- a/update.sh +++ b/update.sh @@ -17,6 +17,17 @@ if [ ${#versions[@]} -eq 0 ]; then fi versions=( "${versions[@]%/}" ) +generated_warning() { + cat <<-EOH + # + # NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" + # + # PLEASE DO NOT EDIT IT DIRECTLY. + # + + EOH +} + jsonSh="$(curl -fsSL 'https://raw.githubusercontent.com/dominictarr/JSON.sh/ed3f9dd285ebd4183934adb54ea5a2fda6b25a98/JSON.sh')" travisEnv= @@ -66,13 +77,13 @@ for version in "${versions[@]}"; do dockerfiles=() - cp -v Dockerfile-debian.template "$version/Dockerfile" + { generated_warning; cat Dockerfile-debian.template; } > "$version/Dockerfile" cp -v docker-php-ext-* "$version/" cp -v docker-php-source "$version/" dockerfiles+=( "$version/Dockerfile" ) if [ -d "$version/alpine" ]; then - cp -v Dockerfile-alpine.template "$version/alpine/Dockerfile" + { generated_warning; cat Dockerfile-alpine.template; } > "$version/alpine/Dockerfile" cp -v docker-php-ext-* "$version/alpine/" cp -v docker-php-source "$version/alpine/" dockerfiles+=( "$version/alpine/Dockerfile" )