diff --git a/7.3/alpine3.13/cli/Dockerfile b/7.3/alpine3.13/cli/Dockerfile index 45624e92f6..4593950cd9 100644 --- a/7.3/alpine3.13/cli/Dockerfile +++ b/7.3/alpine3.13/cli/Dockerfile @@ -103,7 +103,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -130,7 +131,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.3/alpine3.13/fpm/Dockerfile b/7.3/alpine3.13/fpm/Dockerfile index 694395e860..f4223a63e4 100644 --- a/7.3/alpine3.13/fpm/Dockerfile +++ b/7.3/alpine3.13/fpm/Dockerfile @@ -105,7 +105,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -132,7 +133,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.3/alpine3.13/zts/Dockerfile b/7.3/alpine3.13/zts/Dockerfile index 6ce6c04194..e5f3511fc4 100644 --- a/7.3/alpine3.13/zts/Dockerfile +++ b/7.3/alpine3.13/zts/Dockerfile @@ -105,7 +105,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -132,7 +133,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.3/alpine3.14/cli/Dockerfile b/7.3/alpine3.14/cli/Dockerfile index 4524afa0dc..6ebbe50a61 100644 --- a/7.3/alpine3.14/cli/Dockerfile +++ b/7.3/alpine3.14/cli/Dockerfile @@ -102,7 +102,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -129,7 +130,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.3/alpine3.14/fpm/Dockerfile b/7.3/alpine3.14/fpm/Dockerfile index 9410f270f9..33ea88596d 100644 --- a/7.3/alpine3.14/fpm/Dockerfile +++ b/7.3/alpine3.14/fpm/Dockerfile @@ -104,7 +104,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -131,7 +132,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.3/alpine3.14/zts/Dockerfile b/7.3/alpine3.14/zts/Dockerfile index 9bf4999e78..ea7c7db126 100644 --- a/7.3/alpine3.14/zts/Dockerfile +++ b/7.3/alpine3.14/zts/Dockerfile @@ -104,7 +104,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -131,7 +132,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.3/bullseye/apache/Dockerfile b/7.3/bullseye/apache/Dockerfile index 9938212f82..c6b08a3423 100644 --- a/7.3/bullseye/apache/Dockerfile +++ b/7.3/bullseye/apache/Dockerfile @@ -163,6 +163,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libreadline-dev \ @@ -171,9 +172,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -208,7 +207,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -231,7 +230,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -252,6 +251,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.3/bullseye/cli/Dockerfile b/7.3/bullseye/cli/Dockerfile index f6f7bb1031..18ac3050ce 100644 --- a/7.3/bullseye/cli/Dockerfile +++ b/7.3/bullseye/cli/Dockerfile @@ -105,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libreadline-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -173,7 +172,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -194,6 +193,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.3/bullseye/fpm/Dockerfile b/7.3/bullseye/fpm/Dockerfile index 8facdfdfb2..0a559c388d 100644 --- a/7.3/bullseye/fpm/Dockerfile +++ b/7.3/bullseye/fpm/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libreadline-dev \ @@ -112,9 +113,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -149,7 +148,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -172,7 +171,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -193,6 +192,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.3/bullseye/zts/Dockerfile b/7.3/bullseye/zts/Dockerfile index 7add5ab0ea..7f17b57262 100644 --- a/7.3/bullseye/zts/Dockerfile +++ b/7.3/bullseye/zts/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libreadline-dev \ @@ -112,9 +113,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -149,7 +148,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -172,7 +171,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -193,6 +192,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.3/buster/apache/Dockerfile b/7.3/buster/apache/Dockerfile index 59b474a300..1247c83017 100644 --- a/7.3/buster/apache/Dockerfile +++ b/7.3/buster/apache/Dockerfile @@ -163,6 +163,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libreadline-dev \ @@ -171,9 +172,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -208,7 +207,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -231,7 +230,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -252,6 +251,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.3/buster/cli/Dockerfile b/7.3/buster/cli/Dockerfile index 14d6317cf1..5b0edcf120 100644 --- a/7.3/buster/cli/Dockerfile +++ b/7.3/buster/cli/Dockerfile @@ -105,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libreadline-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -173,7 +172,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -194,6 +193,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.3/buster/fpm/Dockerfile b/7.3/buster/fpm/Dockerfile index f5bca9e833..922ea80816 100644 --- a/7.3/buster/fpm/Dockerfile +++ b/7.3/buster/fpm/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libreadline-dev \ @@ -112,9 +113,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -149,7 +148,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -172,7 +171,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -193,6 +192,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile index b204ec92f3..2bdc32be49 100644 --- a/7.3/buster/zts/Dockerfile +++ b/7.3/buster/zts/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libreadline-dev \ @@ -112,9 +113,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -149,7 +148,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -172,7 +171,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -193,6 +192,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.4/alpine3.13/cli/Dockerfile b/7.4/alpine3.13/cli/Dockerfile index 5b5c7b6cfe..24a7044a02 100644 --- a/7.4/alpine3.13/cli/Dockerfile +++ b/7.4/alpine3.13/cli/Dockerfile @@ -105,7 +105,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -132,7 +133,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.4/alpine3.13/fpm/Dockerfile b/7.4/alpine3.13/fpm/Dockerfile index 39c30c0358..a990727e1b 100644 --- a/7.4/alpine3.13/fpm/Dockerfile +++ b/7.4/alpine3.13/fpm/Dockerfile @@ -107,7 +107,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -134,7 +135,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.4/alpine3.13/zts/Dockerfile b/7.4/alpine3.13/zts/Dockerfile index 40338f4293..4fbf7e14db 100644 --- a/7.4/alpine3.13/zts/Dockerfile +++ b/7.4/alpine3.13/zts/Dockerfile @@ -107,7 +107,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -134,7 +135,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.4/alpine3.14/cli/Dockerfile b/7.4/alpine3.14/cli/Dockerfile index 10193f02fc..ab11897b0a 100644 --- a/7.4/alpine3.14/cli/Dockerfile +++ b/7.4/alpine3.14/cli/Dockerfile @@ -104,7 +104,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -131,7 +132,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.4/alpine3.14/fpm/Dockerfile b/7.4/alpine3.14/fpm/Dockerfile index 9d04329b8a..08f2dda719 100644 --- a/7.4/alpine3.14/fpm/Dockerfile +++ b/7.4/alpine3.14/fpm/Dockerfile @@ -106,7 +106,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -133,7 +134,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.4/alpine3.14/zts/Dockerfile b/7.4/alpine3.14/zts/Dockerfile index c842480a6a..3a566f527c 100644 --- a/7.4/alpine3.14/zts/Dockerfile +++ b/7.4/alpine3.14/zts/Dockerfile @@ -106,7 +106,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -133,7 +134,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/7.4/bullseye/apache/Dockerfile b/7.4/bullseye/apache/Dockerfile index 2b86b1c6c4..8811d50719 100644 --- a/7.4/bullseye/apache/Dockerfile +++ b/7.4/bullseye/apache/Dockerfile @@ -163,6 +163,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -172,9 +173,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -209,7 +208,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -235,7 +234,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -256,6 +255,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.4/bullseye/cli/Dockerfile b/7.4/bullseye/cli/Dockerfile index d01b249de4..3a32c8aa68 100644 --- a/7.4/bullseye/cli/Dockerfile +++ b/7.4/bullseye/cli/Dockerfile @@ -105,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -114,9 +115,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -151,7 +150,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -177,7 +176,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -198,6 +197,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.4/bullseye/fpm/Dockerfile b/7.4/bullseye/fpm/Dockerfile index 30cf15025a..e9c16cf1a1 100644 --- a/7.4/bullseye/fpm/Dockerfile +++ b/7.4/bullseye/fpm/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.4/bullseye/zts/Dockerfile b/7.4/bullseye/zts/Dockerfile index cab0c618ff..a7218c804f 100644 --- a/7.4/bullseye/zts/Dockerfile +++ b/7.4/bullseye/zts/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.4/buster/apache/Dockerfile b/7.4/buster/apache/Dockerfile index 0af91cc11e..c73941b3be 100644 --- a/7.4/buster/apache/Dockerfile +++ b/7.4/buster/apache/Dockerfile @@ -163,6 +163,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -172,9 +173,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -209,7 +208,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -235,7 +234,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -256,6 +255,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.4/buster/cli/Dockerfile b/7.4/buster/cli/Dockerfile index 6f85a239ab..7762fec194 100644 --- a/7.4/buster/cli/Dockerfile +++ b/7.4/buster/cli/Dockerfile @@ -105,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -114,9 +115,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -151,7 +150,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -177,7 +176,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -198,6 +197,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.4/buster/fpm/Dockerfile b/7.4/buster/fpm/Dockerfile index 97d6640ed4..32563a2043 100644 --- a/7.4/buster/fpm/Dockerfile +++ b/7.4/buster/fpm/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/7.4/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile index b6845aa71c..8448c39c16 100644 --- a/7.4/buster/zts/Dockerfile +++ b/7.4/buster/zts/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.0/alpine3.13/cli/Dockerfile b/8.0/alpine3.13/cli/Dockerfile index dca22367ea..5b1888708c 100644 --- a/8.0/alpine3.13/cli/Dockerfile +++ b/8.0/alpine3.13/cli/Dockerfile @@ -105,7 +105,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -132,7 +133,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/8.0/alpine3.13/fpm/Dockerfile b/8.0/alpine3.13/fpm/Dockerfile index 08b9a9ddfd..f48aca36e8 100644 --- a/8.0/alpine3.13/fpm/Dockerfile +++ b/8.0/alpine3.13/fpm/Dockerfile @@ -107,7 +107,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -134,7 +135,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/8.0/alpine3.14/cli/Dockerfile b/8.0/alpine3.14/cli/Dockerfile index c0076e38cb..17c9420d34 100644 --- a/8.0/alpine3.14/cli/Dockerfile +++ b/8.0/alpine3.14/cli/Dockerfile @@ -104,7 +104,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -131,7 +132,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/8.0/alpine3.14/fpm/Dockerfile b/8.0/alpine3.14/fpm/Dockerfile index 32b3d6f2be..f766ba38de 100644 --- a/8.0/alpine3.14/fpm/Dockerfile +++ b/8.0/alpine3.14/fpm/Dockerfile @@ -106,7 +106,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -133,7 +134,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/8.0/bullseye/apache/Dockerfile b/8.0/bullseye/apache/Dockerfile index 290b1fa1a0..8bde7fcbb8 100644 --- a/8.0/bullseye/apache/Dockerfile +++ b/8.0/bullseye/apache/Dockerfile @@ -163,6 +163,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -172,9 +173,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -209,7 +208,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -235,7 +234,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -256,6 +255,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.0/bullseye/cli/Dockerfile b/8.0/bullseye/cli/Dockerfile index b97f6c393e..6fa5a357f4 100644 --- a/8.0/bullseye/cli/Dockerfile +++ b/8.0/bullseye/cli/Dockerfile @@ -105,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -114,9 +115,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -151,7 +150,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -177,7 +176,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -198,6 +197,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.0/bullseye/fpm/Dockerfile b/8.0/bullseye/fpm/Dockerfile index 41a453c00e..17aaad1171 100644 --- a/8.0/bullseye/fpm/Dockerfile +++ b/8.0/bullseye/fpm/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.0/bullseye/zts/Dockerfile b/8.0/bullseye/zts/Dockerfile index fcc49e31ba..eef763326c 100644 --- a/8.0/bullseye/zts/Dockerfile +++ b/8.0/bullseye/zts/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile index daa1902d83..a99d5db58d 100644 --- a/8.0/buster/apache/Dockerfile +++ b/8.0/buster/apache/Dockerfile @@ -163,6 +163,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -172,9 +173,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -209,7 +208,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -235,7 +234,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -256,6 +255,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile index d7fb9780c8..6999c6ffd8 100644 --- a/8.0/buster/cli/Dockerfile +++ b/8.0/buster/cli/Dockerfile @@ -105,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -114,9 +115,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -151,7 +150,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -177,7 +176,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -198,6 +197,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index 24bdc300e9..8e761d0987 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index e1ff32dcd8..dd4f8244b5 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1-rc/alpine3.13/cli/Dockerfile b/8.1-rc/alpine3.13/cli/Dockerfile index 909d2e5d0c..06f5fd6a83 100644 --- a/8.1-rc/alpine3.13/cli/Dockerfile +++ b/8.1-rc/alpine3.13/cli/Dockerfile @@ -105,7 +105,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -132,7 +133,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/8.1-rc/alpine3.13/fpm/Dockerfile b/8.1-rc/alpine3.13/fpm/Dockerfile index 4ba068170c..c181f87c0f 100644 --- a/8.1-rc/alpine3.13/fpm/Dockerfile +++ b/8.1-rc/alpine3.13/fpm/Dockerfile @@ -107,7 +107,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -134,7 +135,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/8.1-rc/alpine3.14/cli/Dockerfile b/8.1-rc/alpine3.14/cli/Dockerfile index e876b88262..aab8255efa 100644 --- a/8.1-rc/alpine3.14/cli/Dockerfile +++ b/8.1-rc/alpine3.14/cli/Dockerfile @@ -104,7 +104,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -131,7 +132,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/8.1-rc/alpine3.14/fpm/Dockerfile b/8.1-rc/alpine3.14/fpm/Dockerfile index 4f70c0af3f..6c700c8de8 100644 --- a/8.1-rc/alpine3.14/fpm/Dockerfile +++ b/8.1-rc/alpine3.14/fpm/Dockerfile @@ -106,7 +106,8 @@ RUN set -eux; \ sqlite-dev \ ; \ \ - export CFLAGS="$PHP_CFLAGS" \ + export \ + CFLAGS="$PHP_CFLAGS" \ CPPFLAGS="$PHP_CPPFLAGS" \ LDFLAGS="$PHP_LDFLAGS" \ ; \ @@ -133,7 +134,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ diff --git a/8.1-rc/bullseye/apache/Dockerfile b/8.1-rc/bullseye/apache/Dockerfile index b89e315a52..6ffc5d50ea 100644 --- a/8.1-rc/bullseye/apache/Dockerfile +++ b/8.1-rc/bullseye/apache/Dockerfile @@ -163,6 +163,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -172,9 +173,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -209,7 +208,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -235,7 +234,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -256,6 +255,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1-rc/bullseye/cli/Dockerfile b/8.1-rc/bullseye/cli/Dockerfile index 49201c0459..2211402040 100644 --- a/8.1-rc/bullseye/cli/Dockerfile +++ b/8.1-rc/bullseye/cli/Dockerfile @@ -105,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -114,9 +115,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -151,7 +150,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -177,7 +176,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -198,6 +197,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1-rc/bullseye/fpm/Dockerfile b/8.1-rc/bullseye/fpm/Dockerfile index f848d5501e..9aaa49a962 100644 --- a/8.1-rc/bullseye/fpm/Dockerfile +++ b/8.1-rc/bullseye/fpm/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1-rc/bullseye/zts/Dockerfile b/8.1-rc/bullseye/zts/Dockerfile index 689f9147f4..cd50fc0579 100644 --- a/8.1-rc/bullseye/zts/Dockerfile +++ b/8.1-rc/bullseye/zts/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1-rc/buster/apache/Dockerfile b/8.1-rc/buster/apache/Dockerfile index dfb40e3522..bbf0908e33 100644 --- a/8.1-rc/buster/apache/Dockerfile +++ b/8.1-rc/buster/apache/Dockerfile @@ -163,6 +163,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -172,9 +173,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -209,7 +208,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -235,7 +234,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -256,6 +255,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1-rc/buster/cli/Dockerfile b/8.1-rc/buster/cli/Dockerfile index bbe57aef0f..cf7ab968bc 100644 --- a/8.1-rc/buster/cli/Dockerfile +++ b/8.1-rc/buster/cli/Dockerfile @@ -105,6 +105,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -114,9 +115,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -151,7 +150,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -177,7 +176,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -198,6 +197,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1-rc/buster/fpm/Dockerfile b/8.1-rc/buster/fpm/Dockerfile index 18a2b65019..8b97e7c713 100644 --- a/8.1-rc/buster/fpm/Dockerfile +++ b/8.1-rc/buster/fpm/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1-rc/buster/zts/Dockerfile b/8.1-rc/buster/zts/Dockerfile index 9b8ae9d7c9..570357a598 100644 --- a/8.1-rc/buster/zts/Dockerfile +++ b/8.1-rc/buster/zts/Dockerfile @@ -104,6 +104,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ + ${PHP_EXTRA_BUILD_DEPS:-} \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -113,9 +114,7 @@ RUN set -eux; \ libssl-dev \ libxml2-dev \ zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ export \ CFLAGS="$PHP_CFLAGS" \ @@ -150,7 +149,7 @@ RUN set -eux; \ --enable-mbstring \ # --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) +# https://wiki.php.net/rfc/argon2_password_hash --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ @@ -176,7 +175,7 @@ RUN set -eux; \ make -j "$(nproc)"; \ find -type f -name '*.a' -delete; \ make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ make clean; \ \ # https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) @@ -197,6 +196,7 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template deleted file mode 100644 index d3d86603e0..0000000000 --- a/Dockerfile-alpine.template +++ /dev/null @@ -1,213 +0,0 @@ -{{ include "version-id" -}} -FROM {{ env.from }} - -# dependencies required for running "phpize" -# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) -ENV PHPIZE_DEPS \ - autoconf \ - dpkg-dev dpkg \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - -# persistent / runtime deps -RUN apk add --no-cache \ - ca-certificates \ - curl \ - tar \ - xz \ -# https://github.com/docker-library/php/issues/494 - openssl - -# ensure www-data user exists -RUN set -eux; \ -{{ if (env.from == "alpine:3.13") then ( -}} - addgroup -g 82 -S www-data; \ -{{ ) else "" end -}} - adduser -u 82 -D -S -G www-data www-data -# 82 is the standard uid/gid for "www-data" in Alpine -# https://git.alpinelinux.org/aports/tree/main/apache2/apache2.pre-install?h=3.14-stable -# https://git.alpinelinux.org/aports/tree/main/lighttpd/lighttpd.pre-install?h=3.14-stable -# https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install?h=3.14-stable - -ENV PHP_INI_DIR /usr/local/etc/php -RUN set -eux; \ - mkdir -p "$PHP_INI_DIR/conf.d"; \ -# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743) - [ ! -d /var/www/html ]; \ - mkdir -p /var/www/html; \ - chown www-data:www-data /var/www/html; \ - chmod 777 /var/www/html -{{ - if env.variantBlock1 != "" then - "\n" + env.variantBlock1 + "\n" - else "" end -}} -# 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) -# Enable optimization (-O2) -# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default) -# https://github.com/docker-library/php/issues/272 -# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php) -ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" -ENV PHP_CPPFLAGS="$PHP_CFLAGS" -ENV PHP_LDFLAGS="-Wl,-O1 -pie" - -ENV GPG_KEYS {{ .gpgKeys }} - -ENV PHP_VERSION {{ .version }} -ENV PHP_URL="{{ .url }}" PHP_ASC_URL="{{ .ascUrl // "" }}" -ENV PHP_SHA256="{{ .sha256 // "" }}" - -RUN set -eux; \ - \ - apk add --no-cache --virtual .fetch-deps gnupg; \ - \ - mkdir -p /usr/src; \ - cd /usr/src; \ - \ - curl -fsSL -o php.tar.xz "$PHP_URL"; \ - \ - if [ -n "$PHP_SHA256" ]; then \ - echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \ - fi; \ - \ - if [ -n "$PHP_ASC_URL" ]; then \ - curl -fsSL -o php.tar.xz.asc "$PHP_ASC_URL"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for key in $GPG_KEYS; do \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - done; \ - gpg --batch --verify php.tar.xz.asc php.tar.xz; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME"; \ - fi; \ - \ - apk del --no-network .fetch-deps - -COPY docker-php-source /usr/local/bin/ - -RUN set -eux; \ - apk add --no-cache --virtual .build-deps \ - $PHPIZE_DEPS \ - argon2-dev \ - coreutils \ - curl-dev \ -{{ if (.version | version_id) >= ("7.2" | version_id) then ( -}} - libsodium-dev \ -{{ ) else "" end -}} - libxml2-dev \ -{{ - # https://github.com/docker-library/php/issues/888 - if (.version | version_id) >= ("7.4" | version_id) then ( --}} - linux-headers \ -{{ ) else "" end -}} -{{ if (.version | version_id) >= ("7.4" | version_id) then ( -}} - oniguruma-dev \ -{{ ) else "" end -}} - openssl-dev \ - readline-dev \ - sqlite-dev \ - ; \ - \ - export CFLAGS="$PHP_CFLAGS" \ - CPPFLAGS="$PHP_CPPFLAGS" \ - LDFLAGS="$PHP_LDFLAGS" \ - ; \ - docker-php-source extract; \ - cd /usr/src/php; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --with-config-file-path="$PHP_INI_DIR" \ - --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - \ -# make sure invalid --configure-flags are fatal errors instead of just warnings - --enable-option-checking=fatal \ - \ -# https://github.com/docker-library/php/issues/439 - --with-mhash \ - \ -# https://github.com/docker-library/php/issues/822 - --with-pic \ - \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) - --enable-ftp \ -# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) - --enable-mbstring \ -# --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) - --with-password-argon2 \ -{{ if (.version | version_id) >= ("7.2" | version_id) then ( -}} -# https://wiki.php.net/rfc/libsodium - --with-sodium=shared \ -{{ ) else "" end -}} -# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) - --with-pdo-sqlite=/usr \ - --with-sqlite3=/usr \ - \ - --with-curl \ - --with-openssl \ - --with-readline \ - --with-zlib \ - \ -{{ if (.version | version_id) | . >= ("7.4" | version_id) then ( -}} -# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") - --with-pear \ - \ -{{ ) else "" end -}} -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ - \ - ${PHP_EXTRA_CONFIGURE_ARGS:-} \ - ; \ - make -j "$(nproc)"; \ - find -type f -name '*.a' -delete; \ - make install; \ - find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ - make clean; \ - \ -# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) - cp -v php.ini-* "$PHP_INI_DIR/"; \ - \ - cd /; \ - docker-php-source delete; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-cache $runDeps; \ - \ - apk del --no-network .build-deps; \ - \ -# update pecl channel definitions https://github.com/docker-library/php/issues/443 - pecl update-channels; \ - rm -rf /tmp/pear ~/.pearrc; \ - \ -# smoke test - php --version - -COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ - -{{ if (.version | version_id) >= ("7.2" | version_id) then ( -}} -# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) -RUN docker-php-ext-enable sodium - -{{ ) else "" end -}} -ENTRYPOINT ["docker-php-entrypoint"] -{{ - if env.variantBlock2 != "" then - env.variantBlock2 + "\n" - else "" end - + "CMD " + env.cmd -}} diff --git a/Dockerfile-apache-block-1.template b/Dockerfile-apache-block-1.template deleted file mode 100644 index b853f9e1f2..0000000000 --- a/Dockerfile-apache-block-1.template +++ /dev/null @@ -1,60 +0,0 @@ -ENV APACHE_CONFDIR /etc/apache2 -ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends apache2; \ - rm -rf /var/lib/apt/lists/*; \ - \ -# 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 -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS"; \ - \ -# setup directories and permissions - . "$APACHE_ENVVARS"; \ - for dir in \ - "$APACHE_LOCK_DIR" \ - "$APACHE_RUN_DIR" \ - "$APACHE_LOG_DIR" \ - ; do \ - rm -rvf "$dir"; \ - mkdir -p "$dir"; \ - chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \ -# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743) - chmod 777 "$dir"; \ - done; \ - \ -# delete the "index.html" that installing Apache drops in here - rm -rvf /var/www/html/*; \ - \ -# logs should go to stdout / stderr - ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log"; \ - ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log"; \ - ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"; \ - chown -R --no-dereference "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$APACHE_LOG_DIR" - -# Apache + PHP requires preforking Apache for best results -RUN a2dismod mpm_event && a2enmod mpm_prefork - -# PHP files should be handled by PHP, and should be preferred over any other file type -RUN { \ - echo ''; \ - echo '\tSetHandler application/x-httpd-php'; \ - echo ''; \ - echo; \ - echo 'DirectoryIndex disabled'; \ - echo 'DirectoryIndex index.php index.html'; \ - echo; \ - echo ''; \ - echo '\tOptions -Indexes'; \ - echo '\tAllowOverride All'; \ - echo ''; \ - } | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \ - && a2enconf docker-php - -ENV PHP_EXTRA_BUILD_DEPS apache2-dev -ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi diff --git a/Dockerfile-apache-block-2.template b/Dockerfile-apache-block-2.template deleted file mode 100644 index eb835861f9..0000000000 --- a/Dockerfile-apache-block-2.template +++ /dev/null @@ -1,7 +0,0 @@ -# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop -STOPSIGNAL SIGWINCH - -COPY apache2-foreground /usr/local/bin/ -WORKDIR /var/www/html - -EXPOSE 80 diff --git a/Dockerfile-cli-block-1.template b/Dockerfile-cli-block-1.template deleted file mode 100644 index fdce76479a..0000000000 --- a/Dockerfile-cli-block-1.template +++ /dev/null @@ -1,4 +0,0 @@ -{{ if env.suite | startswith("alpine") | not then ( -}} -# https://github.com/docker-library/php/pull/939#issuecomment-730501748 -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed -{{ ) else "" end -}} diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template deleted file mode 100644 index 5270cc6ce4..0000000000 --- a/Dockerfile-debian.template +++ /dev/null @@ -1,240 +0,0 @@ -{{ include "version-id" -}} -FROM {{ env.from }} - -# prevent Debian's PHP packages from being installed -# https://github.com/docker-library/php/pull/542 -RUN set -eux; \ - { \ - echo 'Package: php*'; \ - echo 'Pin: release *'; \ - echo 'Pin-Priority: -1'; \ - } > /etc/apt/preferences.d/no-debian-php - -# dependencies required for running "phpize" -# (see persistent deps below) -ENV PHPIZE_DEPS \ - autoconf \ - dpkg-dev \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkg-config \ - re2c - -# persistent / runtime deps -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - $PHPIZE_DEPS \ - ca-certificates \ - curl \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/* - -ENV PHP_INI_DIR /usr/local/etc/php -RUN set -eux; \ - mkdir -p "$PHP_INI_DIR/conf.d"; \ -# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743) - [ ! -d /var/www/html ]; \ - mkdir -p /var/www/html; \ - chown www-data:www-data /var/www/html; \ - chmod 777 /var/www/html -{{ - if env.variantBlock1 != "" then - "\n" + env.variantBlock1 + "\n" - else "" end -}} -# 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) -# Enable optimization (-O2) -# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default) -# https://github.com/docker-library/php/issues/272 -# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php) -ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" -ENV PHP_CPPFLAGS="$PHP_CFLAGS" -ENV PHP_LDFLAGS="-Wl,-O1 -pie" - -ENV GPG_KEYS {{ .gpgKeys }} - -ENV PHP_VERSION {{ .version }} -ENV PHP_URL="{{ .url }}" PHP_ASC_URL="{{ .ascUrl // "" }}" -ENV PHP_SHA256="{{ .sha256 // "" }}" - -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends gnupg dirmngr; \ - rm -rf /var/lib/apt/lists/*; \ - \ - mkdir -p /usr/src; \ - cd /usr/src; \ - \ - curl -fsSL -o php.tar.xz "$PHP_URL"; \ - \ - if [ -n "$PHP_SHA256" ]; then \ - echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \ - fi; \ - \ - if [ -n "$PHP_ASC_URL" ]; then \ - curl -fsSL -o php.tar.xz.asc "$PHP_ASC_URL"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for key in $GPG_KEYS; do \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - done; \ - gpg --batch --verify php.tar.xz.asc php.tar.xz; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME"; \ - fi; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false - -COPY docker-php-source /usr/local/bin/ - -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libargon2-dev \ - libcurl4-openssl-dev \ -{{ - # oniguruma is part of mbstring in php 7.4+ - if (.version | version_id) >= ("7.4" | version_id) then ( --}} - libonig-dev \ -{{ ) else "" end -}} - libreadline-dev \ -{{ if (.version | version_id) >= ("7.2" | version_id) then ( -}} - libsodium-dev \ -{{ ) else "" end -}} - libsqlite3-dev \ - libssl-dev \ - libxml2-dev \ - zlib1g-dev \ - ${PHP_EXTRA_BUILD_DEPS:-} \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - export \ - CFLAGS="$PHP_CFLAGS" \ - CPPFLAGS="$PHP_CPPFLAGS" \ - LDFLAGS="$PHP_LDFLAGS" \ - ; \ - docker-php-source extract; \ - cd /usr/src/php; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ -# https://bugs.php.net/bug.php?id=74125 - if [ ! -d /usr/include/curl ]; then \ - ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ - fi; \ - ./configure \ - --build="$gnuArch" \ - --with-config-file-path="$PHP_INI_DIR" \ - --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ - \ -# make sure invalid --configure-flags are fatal errors instead of just warnings - --enable-option-checking=fatal \ - \ -# https://github.com/docker-library/php/issues/439 - --with-mhash \ - \ -# https://github.com/docker-library/php/issues/822 - --with-pic \ - \ -# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) - --enable-ftp \ -# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) - --enable-mbstring \ -# --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 \ -# https://wiki.php.net/rfc/argon2_password_hash (7.2+) - --with-password-argon2 \ -{{ if (.version | version_id) >= ("7.2" | version_id) then ( -}} -# https://wiki.php.net/rfc/libsodium - --with-sodium=shared \ -{{ ) else "" end -}} -# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) - --with-pdo-sqlite=/usr \ - --with-sqlite3=/usr \ - \ - --with-curl \ - --with-openssl \ - --with-readline \ - --with-zlib \ - \ -{{ if (.version | version_id) | . >= ("7.4" | version_id) then ( -}} -# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") - --with-pear \ - \ -{{ ) else "" end -}} -# bundled pcre does not support JIT on s390x -# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT - $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ - --with-libdir="lib/$debMultiarch" \ - \ - ${PHP_EXTRA_CONFIGURE_ARGS:-} \ - ; \ - make -j "$(nproc)"; \ - find -type f -name '*.a' -delete; \ - make install; \ - find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \ - make clean; \ - \ -# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) - cp -v php.ini-* "$PHP_INI_DIR/"; \ - \ - cd /; \ - docker-php-source delete; \ - \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ - find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ -# update pecl channel definitions https://github.com/docker-library/php/issues/443 - pecl update-channels; \ - rm -rf /tmp/pear ~/.pearrc; \ - \ -# smoke test - php --version - -COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ - -{{ if (.version | version_id) >= ("7.2" | version_id) then ( -}} -# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) -RUN docker-php-ext-enable sodium - -{{ ) else "" end -}} -{{ - # https://github.com/docker-library/php/issues/865 - # https://bugs.php.net/bug.php?id=76324 - # https://github.com/php/php-src/pull/3632 - # https://github.com/php/php-src/commit/2d03197749696ac3f8effba6b7977b0d8729fef3 - if (.version | version_id) < ("7.4" | version_id) then ( --}} -# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) -RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config - -{{ ) else "" end -}} -ENTRYPOINT ["docker-php-entrypoint"] -{{ - if env.variantBlock2 != "" then - env.variantBlock2 + "\n" - else "" end - + "CMD " + env.cmd -}} diff --git a/Dockerfile-fpm-block-1.template b/Dockerfile-fpm-block-1.template deleted file mode 100644 index 0e76496aa0..0000000000 --- a/Dockerfile-fpm-block-1.template +++ /dev/null @@ -1 +0,0 @@ -ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi diff --git a/Dockerfile-fpm-block-2.template b/Dockerfile-fpm-block-2.template deleted file mode 100644 index 2e9c285006..0000000000 --- a/Dockerfile-fpm-block-2.template +++ /dev/null @@ -1,50 +0,0 @@ -{{ include "version-id" -}} -WORKDIR /var/www/html - -RUN set -eux; \ - cd /usr/local/etc; \ - if [ -d php-fpm.d ]; then \ - # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" - sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ - cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ - else \ - # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency - mkdir php-fpm.d; \ - cp php-fpm.conf.default php-fpm.d/www.conf; \ - { \ - echo '[global]'; \ - echo 'include=etc/php-fpm.d/*.conf'; \ - } | tee php-fpm.conf; \ - fi; \ - { \ - echo '[global]'; \ - echo 'error_log = /proc/self/fd/2'; \ -{{ if (.version | version_id) >= ("7.3" | version_id) then ( -}} - echo; echo '; https://github.com/docker-library/php/pull/725#issuecomment-443540114'; echo 'log_limit = 8192'; \ -{{ ) else "" end -}} - echo; \ - echo '[www]'; \ - echo '; if we send this to /proc/self/fd/1, it never appears'; \ - echo 'access.log = /proc/self/fd/2'; \ - echo; \ - echo 'clear_env = no'; \ - echo; \ - echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ - echo 'catch_workers_output = yes'; \ -{{ if (.version | version_id) >= ("7.3" | version_id) then ( -}} - echo 'decorate_workers_output = no'; \ -{{ ) else "" end -}} - } | tee php-fpm.d/docker.conf; \ - { \ - echo '[global]'; \ - echo 'daemonize = no'; \ - echo; \ - echo '[www]'; \ - echo 'listen = 9000'; \ - } | tee php-fpm.d/zz-docker.conf - -# Override stop signal to stop process gracefully -# https://github.com/php/php-src/blob/17baa87faddc2550def3ae7314236826bc1b1398/sapi/fpm/php-fpm.8.in#L163 -STOPSIGNAL SIGQUIT - -EXPOSE 9000 diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template new file mode 100644 index 0000000000..d980dc8441 --- /dev/null +++ b/Dockerfile-linux.template @@ -0,0 +1,458 @@ +{{ + def version_id: + # https://www.php.net/phpversion + # $version_id = $major_version * 10000 + $minor_version * 100 + $release_version; + sub("[a-zA-Z].*$"; "") + | split(".") + | ( + (.[0] // 0 | tonumber) * 10000 + + (.[1] // 0 | tonumber) * 100 + + (.[2] // 0 | tonumber) + ) + ; + def is_alpine: + env.from | startswith("alpine") +-}} +FROM {{ env.from }} + +{{ if is_alpine then "" else ( -}} +# prevent Debian's PHP packages from being installed +# https://github.com/docker-library/php/pull/542 +RUN set -eux; \ + { \ + echo 'Package: php*'; \ + echo 'Pin: release *'; \ + echo 'Pin-Priority: -1'; \ + } > /etc/apt/preferences.d/no-debian-php + +{{ ) end -}} +# dependencies required for running "phpize" +{{ if is_alpine then ( -}} +# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) +{{ ) else ( -}} +# (see persistent deps below) +{{ ) end -}} +ENV PHPIZE_DEPS \ + autoconf \ + dpkg-dev {{ if is_alpine then "dpkg " else "" end }}\ + file \ + g++ \ + gcc \ + libc-dev \ + make \ + {{ if is_alpine then "pkgconf" else "pkg-config" end }} \ + re2c + +# persistent / runtime deps +{{ if is_alpine then ( -}} +RUN apk add --no-cache \ + ca-certificates \ + curl \ + tar \ + xz \ +# https://github.com/docker-library/php/issues/494 + openssl + +# ensure www-data user exists +RUN set -eux; \ +{{ if env.alpineVer == "3.13" then ( -}} + addgroup -g 82 -S www-data; \ +{{ ) else "" end -}} + adduser -u 82 -D -S -G www-data www-data +# 82 is the standard uid/gid for "www-data" in Alpine +# https://git.alpinelinux.org/aports/tree/main/apache2/apache2.pre-install?h=3.14-stable +# https://git.alpinelinux.org/aports/tree/main/lighttpd/lighttpd.pre-install?h=3.14-stable +# https://git.alpinelinux.org/aports/tree/main/nginx/nginx.pre-install?h=3.14-stable +{{ ) else ( -}} +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + $PHPIZE_DEPS \ + ca-certificates \ + curl \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/* +{{ ) end -}} + +ENV PHP_INI_DIR /usr/local/etc/php +RUN set -eux; \ + mkdir -p "$PHP_INI_DIR/conf.d"; \ +# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743) + [ ! -d /var/www/html ]; \ + mkdir -p /var/www/html; \ + chown www-data:www-data /var/www/html; \ + chmod 777 /var/www/html + +{{ if env.variant == "apache" then ( -}} +ENV APACHE_CONFDIR /etc/apache2 +ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends apache2; \ + rm -rf /var/lib/apt/lists/*; \ + \ +# 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 -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS"; \ + \ +# setup directories and permissions + . "$APACHE_ENVVARS"; \ + for dir in \ + "$APACHE_LOCK_DIR" \ + "$APACHE_RUN_DIR" \ + "$APACHE_LOG_DIR" \ + ; do \ + rm -rvf "$dir"; \ + mkdir -p "$dir"; \ + chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \ +# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743) + chmod 777 "$dir"; \ + done; \ + \ +# delete the "index.html" that installing Apache drops in here + rm -rvf /var/www/html/*; \ + \ +# logs should go to stdout / stderr + ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log"; \ + ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log"; \ + ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"; \ + chown -R --no-dereference "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$APACHE_LOG_DIR" + +# Apache + PHP requires preforking Apache for best results +RUN a2dismod mpm_event && a2enmod mpm_prefork + +# PHP files should be handled by PHP, and should be preferred over any other file type +RUN { \ + echo ''; \ + echo '\tSetHandler application/x-httpd-php'; \ + echo ''; \ + echo; \ + echo 'DirectoryIndex disabled'; \ + echo 'DirectoryIndex index.php index.html'; \ + echo; \ + echo ''; \ + echo '\tOptions -Indexes'; \ + echo '\tAllowOverride All'; \ + echo ''; \ + } | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \ + && a2enconf docker-php + +ENV PHP_EXTRA_BUILD_DEPS apache2-dev +ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi + +{{ ) elif env.variant == "cli" then ( -}} +{{ if is_alpine then "" else ( -}} +# https://github.com/docker-library/php/pull/939#issuecomment-730501748 +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-embed + +{{ ) end -}} +{{ ) elif env.variant == "fpm" then ( -}} +ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi + +{{ ) elif env.variant == "zts" then ( -}} +ENV PHP_EXTRA_CONFIGURE_ARGS {{ + if (.version | version_id) >= ("8" | version_id) then + "--enable-zts" + else + "--enable-maintainer-zts" + end +}} --disable-cgi + +{{ ) else "" end -}} +# 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) +# Enable optimization (-O2) +# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default) +# https://github.com/docker-library/php/issues/272 +# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php) +ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" +ENV PHP_CPPFLAGS="$PHP_CFLAGS" +ENV PHP_LDFLAGS="-Wl,-O1 -pie" + +ENV GPG_KEYS {{ .gpgKeys }} + +ENV PHP_VERSION {{ .version }} +ENV PHP_URL="{{ .url }}" PHP_ASC_URL="{{ .ascUrl // "" }}" +ENV PHP_SHA256="{{ .sha256 // "" }}" + +RUN set -eux; \ + \ +{{ if is_alpine then ( -}} + apk add --no-cache --virtual .fetch-deps gnupg; \ +{{ ) else ( -}} + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends gnupg dirmngr; \ + rm -rf /var/lib/apt/lists/*; \ +{{ ) end -}} + \ + mkdir -p /usr/src; \ + cd /usr/src; \ + \ + curl -fsSL -o php.tar.xz "$PHP_URL"; \ + \ + if [ -n "$PHP_SHA256" ]; then \ + echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \ + fi; \ + \ + if [ -n "$PHP_ASC_URL" ]; then \ + curl -fsSL -o php.tar.xz.asc "$PHP_ASC_URL"; \ + export GNUPGHOME="$(mktemp -d)"; \ + for key in $GPG_KEYS; do \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ + done; \ + gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + gpgconf --kill all; \ + rm -rf "$GNUPGHOME"; \ + fi; \ + \ +{{ if is_alpine then ( -}} + apk del --no-network .fetch-deps +{{ ) else ( -}} + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false +{{ ) end -}} + +COPY docker-php-source /usr/local/bin/ + +RUN set -eux; \ +{{ if is_alpine then ( -}} + apk add --no-cache --virtual .build-deps \ +{{ ) else ( -}} + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +{{ ) end -}} +{{ + [ + [ if is_alpine then + # alpine packages + "$PHPIZE_DEPS", + "argon2-dev", + "coreutils", + "curl-dev", + "libsodium-dev", + "libxml2-dev", + "openssl-dev", + "readline-dev", + "sqlite-dev", + # https://github.com/docker-library/php/issues/888 + if (.version | version_id) >= ("7.4" | version_id) then "linux-headers" else empty end, + # oniguruma is part of mbstring in php 7.4+ + if (.version | version_id) >= ("7.4" | version_id) then "oniguruma-dev" else empty end + else + # debian packages + "${PHP_EXTRA_BUILD_DEPS:-}", + "libargon2-dev", + "libcurl4-openssl-dev", + "libreadline-dev", + "libsodium-dev", + "libsqlite3-dev", + "libssl-dev", + "libxml2-dev", + "zlib1g-dev", + # oniguruma is part of mbstring in php 7.4+ + if (.version | version_id) >= ("7.4" | version_id) then "libonig-dev" else empty end + end ] | sort[] | ( +-}} + {{ . }} \ +{{ + ) + ] | add +-}} + ; \ + \ + export \ + CFLAGS="$PHP_CFLAGS" \ + CPPFLAGS="$PHP_CPPFLAGS" \ + LDFLAGS="$PHP_LDFLAGS" \ + ; \ + docker-php-source extract; \ + cd /usr/src/php; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +{{ if is_alpine then "" else ( -}} + debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ +# https://bugs.php.net/bug.php?id=74125 + if [ ! -d /usr/include/curl ]; then \ + ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \ + fi; \ +{{ ) end -}} + ./configure \ + --build="$gnuArch" \ + --with-config-file-path="$PHP_INI_DIR" \ + --with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \ + \ +# make sure invalid --configure-flags are fatal errors instead of just warnings + --enable-option-checking=fatal \ + \ +# https://github.com/docker-library/php/issues/439 + --with-mhash \ + \ +# https://github.com/docker-library/php/issues/822 + --with-pic \ + \ +# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236) + --enable-ftp \ +# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195) + --enable-mbstring \ +# --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 \ +# https://wiki.php.net/rfc/argon2_password_hash + --with-password-argon2 \ +# https://wiki.php.net/rfc/libsodium + --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ + \ + --with-curl \ + --with-openssl \ + --with-readline \ + --with-zlib \ + \ +{{ if (.version | version_id) >= ("7.4" | version_id) then ( -}} +# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") + --with-pear \ + \ +{{ ) else "" end -}} +# bundled pcre does not support JIT on s390x +# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT +{{ if is_alpine then ( -}} + $(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \ +{{ ) else ( -}} + $(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \ + --with-libdir="lib/$debMultiarch" \ +{{ ) end -}} + \ + ${PHP_EXTRA_CONFIGURE_ARGS:-} \ + ; \ + make -j "$(nproc)"; \ + find -type f -name '*.a' -delete; \ + make install; \ + find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; \ + make clean; \ + \ +# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable) + cp -v php.ini-* "$PHP_INI_DIR/"; \ + \ + cd /; \ + docker-php-source delete; \ + \ +{{ if is_alpine then ( -}} + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-cache $runDeps; \ + \ + apk del --no-network .build-deps; \ +{{ ) else ( -}} +# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies + apt-mark auto '.*' > /dev/null; \ + [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ + find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/*; \ +{{ ) end -}} + \ +# update pecl channel definitions https://github.com/docker-library/php/issues/443 + pecl update-channels; \ + rm -rf /tmp/pear ~/.pearrc; \ + \ +# smoke test + php --version + +COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/ + +# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598) +RUN docker-php-ext-enable sodium + +{{ + # https://github.com/docker-library/php/issues/865 + # https://bugs.php.net/bug.php?id=76324 + # https://github.com/php/php-src/pull/3632 + # https://github.com/php/php-src/commit/2d03197749696ac3f8effba6b7977b0d8729fef3 + if (is_alpine | not) and (.version | version_id) < ("7.4" | version_id) then ( +-}} +# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324) +RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config + +{{ ) else "" end -}} +ENTRYPOINT ["docker-php-entrypoint"] +{{ if env.variant == "apache" then ( -}} +# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop +STOPSIGNAL SIGWINCH + +COPY apache2-foreground /usr/local/bin/ +WORKDIR /var/www/html + +EXPOSE 80 +{{ ) elif env.variant == "fpm" then ( -}} +WORKDIR /var/www/html + +RUN set -eux; \ + cd /usr/local/etc; \ + if [ -d php-fpm.d ]; then \ + # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf" + sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \ + cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \ + else \ + # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency + mkdir php-fpm.d; \ + cp php-fpm.conf.default php-fpm.d/www.conf; \ + { \ + echo '[global]'; \ + echo 'include=etc/php-fpm.d/*.conf'; \ + } | tee php-fpm.conf; \ + fi; \ + { \ + echo '[global]'; \ + echo 'error_log = /proc/self/fd/2'; \ +{{ if (.version | version_id) >= ("7.3" | version_id) then ( -}} + echo; echo '; https://github.com/docker-library/php/pull/725#issuecomment-443540114'; echo 'log_limit = 8192'; \ +{{ ) else "" end -}} + echo; \ + echo '[www]'; \ + echo '; if we send this to /proc/self/fd/1, it never appears'; \ + echo 'access.log = /proc/self/fd/2'; \ + echo; \ + echo 'clear_env = no'; \ + echo; \ + echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ + echo 'catch_workers_output = yes'; \ +{{ if (.version | version_id) >= ("7.3" | version_id) then ( -}} + echo 'decorate_workers_output = no'; \ +{{ ) else "" end -}} + } | tee php-fpm.d/docker.conf; \ + { \ + echo '[global]'; \ + echo 'daemonize = no'; \ + echo; \ + echo '[www]'; \ + echo 'listen = 9000'; \ + } | tee php-fpm.d/zz-docker.conf + +# Override stop signal to stop process gracefully +# https://github.com/php/php-src/blob/17baa87faddc2550def3ae7314236826bc1b1398/sapi/fpm/php-fpm.8.in#L163 +STOPSIGNAL SIGQUIT + +EXPOSE 9000 +{{ ) else "" end -}} +CMD {{ env.cmd }} diff --git a/Dockerfile-zts-block-1.template b/Dockerfile-zts-block-1.template deleted file mode 100644 index d1da1461ec..0000000000 --- a/Dockerfile-zts-block-1.template +++ /dev/null @@ -1,8 +0,0 @@ -{{ include "version-id" -}} -ENV PHP_EXTRA_CONFIGURE_ARGS {{ - if (.version | version_id) >= ("8" | version_id) then - "--enable-zts" - else - "--enable-maintainer-zts" - end -}} --disable-cgi diff --git a/apply-templates.sh b/apply-templates.sh index 8effcc99e3..2f2e27a9ed 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -39,13 +39,11 @@ for version; do alpineVer="${suite#alpine}" # "3.12", etc if [ "$suite" != "$alpineVer" ]; then - template='Dockerfile-alpine.template' from="alpine:$alpineVer" else - template='Dockerfile-debian.template' from="debian:$suite-slim" fi - export from + export from alpineVer case "$variant" in apache) cmd='["apache2-foreground"]' ;; @@ -57,13 +55,9 @@ for version; do echo "processing $version/$dir ..." mkdir -p "$version/$dir" - variantBlock1="$(if [ -f "Dockerfile-$variant-block-1.template" ]; then gawk -f "$jqt" "Dockerfile-$variant-block-1.template"; fi)" - variantBlock2="$(if [ -f "Dockerfile-$variant-block-2.template" ]; then gawk -f "$jqt" "Dockerfile-$variant-block-2.template"; fi)" - export variantBlock1 variantBlock2 - { generated_warning - gawk -f "$jqt" "$template" + gawk -f "$jqt" 'Dockerfile-linux.template' } > "$version/$dir/Dockerfile" cp -a \ diff --git a/version-id.jq b/version-id.jq deleted file mode 100644 index 88c75bf5eb..0000000000 --- a/version-id.jq +++ /dev/null @@ -1,11 +0,0 @@ -def version_id: - # https://www.php.net/phpversion - # $version_id = $major_version * 10000 + $minor_version * 100 + $release_version; - sub("[a-zA-Z].*$"; "") - | split(".") - | ( - (.[0] // 0 | tonumber) * 10000 - + (.[1] // 0 | tonumber) * 100 - + (.[2] // 0 | tonumber) - ) -;