diff --git a/7.3/bullseye/zts/Dockerfile b/7.3/bullseye/zts/Dockerfile index becd4ef61..11eae06a7 100644 --- a/7.3/bullseye/zts/Dockerfile +++ b/7.3/bullseye/zts/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux; \ chown www-data:www-data /var/www/html; \ chmod 777 /var/www/html -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --enable-embed --disable-cgi # Apply stack smash protection to functions using local buffers and alloca() # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) diff --git a/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile index 68b3039ed..94aa0750a 100644 --- a/7.3/buster/zts/Dockerfile +++ b/7.3/buster/zts/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux; \ chown www-data:www-data /var/www/html; \ chmod 777 /var/www/html -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --enable-embed --disable-cgi # Apply stack smash protection to functions using local buffers and alloca() # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) diff --git a/7.4/bullseye/zts/Dockerfile b/7.4/bullseye/zts/Dockerfile index 9ec22c9e9..75e51afa3 100644 --- a/7.4/bullseye/zts/Dockerfile +++ b/7.4/bullseye/zts/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux; \ chown www-data:www-data /var/www/html; \ chmod 777 /var/www/html -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --enable-embed --disable-cgi # Apply stack smash protection to functions using local buffers and alloca() # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) diff --git a/7.4/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile index 4dab3cbb2..1548b94c9 100644 --- a/7.4/buster/zts/Dockerfile +++ b/7.4/buster/zts/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux; \ chown www-data:www-data /var/www/html; \ chmod 777 /var/www/html -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --enable-embed --disable-cgi # Apply stack smash protection to functions using local buffers and alloca() # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) diff --git a/8.0/bullseye/zts/Dockerfile b/8.0/bullseye/zts/Dockerfile index 192da3cfe..2a705b394 100644 --- a/8.0/bullseye/zts/Dockerfile +++ b/8.0/bullseye/zts/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux; \ chown www-data:www-data /var/www/html; \ chmod 777 /var/www/html -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --disable-cgi +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --enable-embed --disable-cgi # Apply stack smash protection to functions using local buffers and alloca() # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index 6b25345d8..eb19f13a5 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux; \ chown www-data:www-data /var/www/html; \ chmod 777 /var/www/html -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --disable-cgi +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --enable-embed --disable-cgi # Apply stack smash protection to functions using local buffers and alloca() # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) diff --git a/8.1-rc/bullseye/zts/Dockerfile b/8.1-rc/bullseye/zts/Dockerfile index 7349cb627..3f54e5c6a 100644 --- a/8.1-rc/bullseye/zts/Dockerfile +++ b/8.1-rc/bullseye/zts/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux; \ chown www-data:www-data /var/www/html; \ chmod 777 /var/www/html -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --disable-cgi +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --enable-embed --disable-cgi # Apply stack smash protection to functions using local buffers and alloca() # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) diff --git a/8.1-rc/buster/zts/Dockerfile b/8.1-rc/buster/zts/Dockerfile index 9d0f6fc4c..82361e28e 100644 --- a/8.1-rc/buster/zts/Dockerfile +++ b/8.1-rc/buster/zts/Dockerfile @@ -48,7 +48,7 @@ RUN set -eux; \ chown www-data:www-data /var/www/html; \ chmod 777 /var/www/html -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --disable-cgi +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-zts --enable-embed --disable-cgi # Apply stack smash protection to functions using local buffers and alloca() # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64) diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index d980dc844..f53cb2873 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -162,6 +162,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS {{ else "--enable-maintainer-zts" end +-}} +{{ + if (is_alpine | not) then + " --enable-embed" + else "" end }} --disable-cgi {{ ) else "" end -}}