From 686f9529f8659f929509a2c3ec2df34a14a4594a Mon Sep 17 00:00:00 2001 From: Manuel Dalla Lana Date: Thu, 24 Jul 2025 18:32:27 +0200 Subject: [PATCH] Add Debian Trixie (and remove Bullseye) --- 8.1/bookworm/apache/Dockerfile | 5 ++- 8.1/bookworm/cli/Dockerfile | 5 ++- 8.1/bookworm/fpm/Dockerfile | 5 ++- 8.1/bookworm/zts/Dockerfile | 5 ++- 8.1/{bullseye => trixie}/apache/Dockerfile | 17 ++++---- .../apache/apache2-foreground | 0 .../apache/docker-php-entrypoint | 0 .../apache/docker-php-ext-configure | 0 .../apache/docker-php-ext-enable | 0 .../apache/docker-php-ext-install | 0 .../apache/docker-php-source | 0 8.1/{bullseye => trixie}/cli/Dockerfile | 13 +++--- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.1/{bullseye => trixie}/fpm/Dockerfile | 13 +++--- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.1/{bullseye => trixie}/zts/Dockerfile | 13 +++--- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 8.2/bookworm/apache/Dockerfile | 5 ++- 8.2/bookworm/cli/Dockerfile | 5 ++- 8.2/bookworm/fpm/Dockerfile | 5 ++- 8.2/bookworm/zts/Dockerfile | 5 ++- 8.2/{bullseye => trixie}/apache/Dockerfile | 17 ++++---- .../apache/apache2-foreground | 0 .../apache/docker-php-entrypoint | 0 .../apache/docker-php-ext-configure | 0 .../apache/docker-php-ext-enable | 0 .../apache/docker-php-ext-install | 0 .../apache/docker-php-source | 0 8.2/{bullseye => trixie}/cli/Dockerfile | 13 +++--- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.2/{bullseye => trixie}/fpm/Dockerfile | 13 +++--- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.2/{bullseye => trixie}/zts/Dockerfile | 13 +++--- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 8.3/bookworm/apache/Dockerfile | 5 ++- 8.3/bookworm/cli/Dockerfile | 5 ++- 8.3/bookworm/fpm/Dockerfile | 5 ++- 8.3/bookworm/zts/Dockerfile | 5 ++- 8.3/{bullseye => trixie}/apache/Dockerfile | 17 ++++---- .../apache/apache2-foreground | 0 .../apache/docker-php-entrypoint | 0 .../apache/docker-php-ext-configure | 0 .../apache/docker-php-ext-enable | 0 .../apache/docker-php-ext-install | 0 .../apache/docker-php-source | 0 8.3/{bullseye => trixie}/cli/Dockerfile | 13 +++--- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.3/{bullseye => trixie}/fpm/Dockerfile | 13 +++--- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.3/{bullseye => trixie}/zts/Dockerfile | 13 +++--- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 8.4/bookworm/apache/Dockerfile | 5 ++- 8.4/bookworm/cli/Dockerfile | 5 ++- 8.4/bookworm/fpm/Dockerfile | 5 ++- 8.4/bookworm/zts/Dockerfile | 5 ++- 8.4/{bullseye => trixie}/apache/Dockerfile | 17 ++++---- .../apache/apache2-foreground | 0 .../apache/docker-php-entrypoint | 0 .../apache/docker-php-ext-configure | 0 .../apache/docker-php-ext-enable | 0 .../apache/docker-php-ext-install | 0 .../apache/docker-php-source | 0 8.4/{bullseye => trixie}/cli/Dockerfile | 13 +++--- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.4/{bullseye => trixie}/fpm/Dockerfile | 13 +++--- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.4/{bullseye => trixie}/zts/Dockerfile | 13 +++--- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 8.5-rc/bookworm/apache/Dockerfile | 5 ++- 8.5-rc/bookworm/cli/Dockerfile | 5 ++- 8.5-rc/bookworm/fpm/Dockerfile | 5 ++- 8.5-rc/bookworm/zts/Dockerfile | 5 ++- 8.5-rc/{bullseye => trixie}/apache/Dockerfile | 17 ++++---- .../apache/apache2-foreground | 0 .../apache/docker-php-entrypoint | 0 .../apache/docker-php-ext-configure | 0 .../apache/docker-php-ext-enable | 0 .../apache/docker-php-ext-install | 0 .../apache/docker-php-source | 0 8.5-rc/{bullseye => trixie}/cli/Dockerfile | 13 +++--- .../cli/docker-php-entrypoint | 0 .../cli/docker-php-ext-configure | 0 .../cli/docker-php-ext-enable | 0 .../cli/docker-php-ext-install | 0 .../cli/docker-php-source | 0 8.5-rc/{bullseye => trixie}/fpm/Dockerfile | 13 +++--- .../fpm/docker-php-entrypoint | 0 .../fpm/docker-php-ext-configure | 0 .../fpm/docker-php-ext-enable | 0 .../fpm/docker-php-ext-install | 0 .../fpm/docker-php-source | 0 8.5-rc/{bullseye => trixie}/zts/Dockerfile | 13 +++--- .../zts/docker-php-entrypoint | 0 .../zts/docker-php-ext-configure | 0 .../zts/docker-php-ext-enable | 0 .../zts/docker-php-ext-install | 0 .../zts/docker-php-source | 0 Dockerfile-linux.template | 21 ++++++---- versions.json | 40 +++++++++---------- versions.sh | 2 +- 148 files changed, 249 insertions(+), 194 deletions(-) rename 8.1/{bullseye => trixie}/apache/Dockerfile (95%) rename 8.1/{bullseye => trixie}/apache/apache2-foreground (100%) rename 8.1/{bullseye => trixie}/apache/docker-php-entrypoint (100%) rename 8.1/{bullseye => trixie}/apache/docker-php-ext-configure (100%) rename 8.1/{bullseye => trixie}/apache/docker-php-ext-enable (100%) rename 8.1/{bullseye => trixie}/apache/docker-php-ext-install (100%) rename 8.1/{bullseye => trixie}/apache/docker-php-source (100%) rename 8.1/{bullseye => trixie}/cli/Dockerfile (95%) rename 8.1/{bullseye => trixie}/cli/docker-php-entrypoint (100%) rename 8.1/{bullseye => trixie}/cli/docker-php-ext-configure (100%) rename 8.1/{bullseye => trixie}/cli/docker-php-ext-enable (100%) rename 8.1/{bullseye => trixie}/cli/docker-php-ext-install (100%) rename 8.1/{bullseye => trixie}/cli/docker-php-source (100%) rename 8.1/{bullseye => trixie}/fpm/Dockerfile (96%) rename 8.1/{bullseye => trixie}/fpm/docker-php-entrypoint (100%) rename 8.1/{bullseye => trixie}/fpm/docker-php-ext-configure (100%) rename 8.1/{bullseye => trixie}/fpm/docker-php-ext-enable (100%) rename 8.1/{bullseye => trixie}/fpm/docker-php-ext-install (100%) rename 8.1/{bullseye => trixie}/fpm/docker-php-source (100%) rename 8.1/{bullseye => trixie}/zts/Dockerfile (95%) rename 8.1/{bullseye => trixie}/zts/docker-php-entrypoint (100%) rename 8.1/{bullseye => trixie}/zts/docker-php-ext-configure (100%) rename 8.1/{bullseye => trixie}/zts/docker-php-ext-enable (100%) rename 8.1/{bullseye => trixie}/zts/docker-php-ext-install (100%) rename 8.1/{bullseye => trixie}/zts/docker-php-source (100%) rename 8.2/{bullseye => trixie}/apache/Dockerfile (94%) rename 8.2/{bullseye => trixie}/apache/apache2-foreground (100%) rename 8.2/{bullseye => trixie}/apache/docker-php-entrypoint (100%) rename 8.2/{bullseye => trixie}/apache/docker-php-ext-configure (100%) rename 8.2/{bullseye => trixie}/apache/docker-php-ext-enable (100%) rename 8.2/{bullseye => trixie}/apache/docker-php-ext-install (100%) rename 8.2/{bullseye => trixie}/apache/docker-php-source (100%) rename 8.2/{bullseye => trixie}/cli/Dockerfile (95%) rename 8.2/{bullseye => trixie}/cli/docker-php-entrypoint (100%) rename 8.2/{bullseye => trixie}/cli/docker-php-ext-configure (100%) rename 8.2/{bullseye => trixie}/cli/docker-php-ext-enable (100%) rename 8.2/{bullseye => trixie}/cli/docker-php-ext-install (100%) rename 8.2/{bullseye => trixie}/cli/docker-php-source (100%) rename 8.2/{bullseye => trixie}/fpm/Dockerfile (96%) rename 8.2/{bullseye => trixie}/fpm/docker-php-entrypoint (100%) rename 8.2/{bullseye => trixie}/fpm/docker-php-ext-configure (100%) rename 8.2/{bullseye => trixie}/fpm/docker-php-ext-enable (100%) rename 8.2/{bullseye => trixie}/fpm/docker-php-ext-install (100%) rename 8.2/{bullseye => trixie}/fpm/docker-php-source (100%) rename 8.2/{bullseye => trixie}/zts/Dockerfile (95%) rename 8.2/{bullseye => trixie}/zts/docker-php-entrypoint (100%) rename 8.2/{bullseye => trixie}/zts/docker-php-ext-configure (100%) rename 8.2/{bullseye => trixie}/zts/docker-php-ext-enable (100%) rename 8.2/{bullseye => trixie}/zts/docker-php-ext-install (100%) rename 8.2/{bullseye => trixie}/zts/docker-php-source (100%) rename 8.3/{bullseye => trixie}/apache/Dockerfile (94%) rename 8.3/{bullseye => trixie}/apache/apache2-foreground (100%) rename 8.3/{bullseye => trixie}/apache/docker-php-entrypoint (100%) rename 8.3/{bullseye => trixie}/apache/docker-php-ext-configure (100%) rename 8.3/{bullseye => trixie}/apache/docker-php-ext-enable (100%) rename 8.3/{bullseye => trixie}/apache/docker-php-ext-install (100%) rename 8.3/{bullseye => trixie}/apache/docker-php-source (100%) rename 8.3/{bullseye => trixie}/cli/Dockerfile (95%) rename 8.3/{bullseye => trixie}/cli/docker-php-entrypoint (100%) rename 8.3/{bullseye => trixie}/cli/docker-php-ext-configure (100%) rename 8.3/{bullseye => trixie}/cli/docker-php-ext-enable (100%) rename 8.3/{bullseye => trixie}/cli/docker-php-ext-install (100%) rename 8.3/{bullseye => trixie}/cli/docker-php-source (100%) rename 8.3/{bullseye => trixie}/fpm/Dockerfile (96%) rename 8.3/{bullseye => trixie}/fpm/docker-php-entrypoint (100%) rename 8.3/{bullseye => trixie}/fpm/docker-php-ext-configure (100%) rename 8.3/{bullseye => trixie}/fpm/docker-php-ext-enable (100%) rename 8.3/{bullseye => trixie}/fpm/docker-php-ext-install (100%) rename 8.3/{bullseye => trixie}/fpm/docker-php-source (100%) rename 8.3/{bullseye => trixie}/zts/Dockerfile (95%) rename 8.3/{bullseye => trixie}/zts/docker-php-entrypoint (100%) rename 8.3/{bullseye => trixie}/zts/docker-php-ext-configure (100%) rename 8.3/{bullseye => trixie}/zts/docker-php-ext-enable (100%) rename 8.3/{bullseye => trixie}/zts/docker-php-ext-install (100%) rename 8.3/{bullseye => trixie}/zts/docker-php-source (100%) rename 8.4/{bullseye => trixie}/apache/Dockerfile (94%) rename 8.4/{bullseye => trixie}/apache/apache2-foreground (100%) rename 8.4/{bullseye => trixie}/apache/docker-php-entrypoint (100%) rename 8.4/{bullseye => trixie}/apache/docker-php-ext-configure (100%) rename 8.4/{bullseye => trixie}/apache/docker-php-ext-enable (100%) rename 8.4/{bullseye => trixie}/apache/docker-php-ext-install (100%) rename 8.4/{bullseye => trixie}/apache/docker-php-source (100%) rename 8.4/{bullseye => trixie}/cli/Dockerfile (95%) rename 8.4/{bullseye => trixie}/cli/docker-php-entrypoint (100%) rename 8.4/{bullseye => trixie}/cli/docker-php-ext-configure (100%) rename 8.4/{bullseye => trixie}/cli/docker-php-ext-enable (100%) rename 8.4/{bullseye => trixie}/cli/docker-php-ext-install (100%) rename 8.4/{bullseye => trixie}/cli/docker-php-source (100%) rename 8.4/{bullseye => trixie}/fpm/Dockerfile (96%) rename 8.4/{bullseye => trixie}/fpm/docker-php-entrypoint (100%) rename 8.4/{bullseye => trixie}/fpm/docker-php-ext-configure (100%) rename 8.4/{bullseye => trixie}/fpm/docker-php-ext-enable (100%) rename 8.4/{bullseye => trixie}/fpm/docker-php-ext-install (100%) rename 8.4/{bullseye => trixie}/fpm/docker-php-source (100%) rename 8.4/{bullseye => trixie}/zts/Dockerfile (95%) rename 8.4/{bullseye => trixie}/zts/docker-php-entrypoint (100%) rename 8.4/{bullseye => trixie}/zts/docker-php-ext-configure (100%) rename 8.4/{bullseye => trixie}/zts/docker-php-ext-enable (100%) rename 8.4/{bullseye => trixie}/zts/docker-php-ext-install (100%) rename 8.4/{bullseye => trixie}/zts/docker-php-source (100%) rename 8.5-rc/{bullseye => trixie}/apache/Dockerfile (94%) rename 8.5-rc/{bullseye => trixie}/apache/apache2-foreground (100%) rename 8.5-rc/{bullseye => trixie}/apache/docker-php-entrypoint (100%) rename 8.5-rc/{bullseye => trixie}/apache/docker-php-ext-configure (100%) rename 8.5-rc/{bullseye => trixie}/apache/docker-php-ext-enable (100%) rename 8.5-rc/{bullseye => trixie}/apache/docker-php-ext-install (100%) rename 8.5-rc/{bullseye => trixie}/apache/docker-php-source (100%) rename 8.5-rc/{bullseye => trixie}/cli/Dockerfile (95%) rename 8.5-rc/{bullseye => trixie}/cli/docker-php-entrypoint (100%) rename 8.5-rc/{bullseye => trixie}/cli/docker-php-ext-configure (100%) rename 8.5-rc/{bullseye => trixie}/cli/docker-php-ext-enable (100%) rename 8.5-rc/{bullseye => trixie}/cli/docker-php-ext-install (100%) rename 8.5-rc/{bullseye => trixie}/cli/docker-php-source (100%) rename 8.5-rc/{bullseye => trixie}/fpm/Dockerfile (96%) rename 8.5-rc/{bullseye => trixie}/fpm/docker-php-entrypoint (100%) rename 8.5-rc/{bullseye => trixie}/fpm/docker-php-ext-configure (100%) rename 8.5-rc/{bullseye => trixie}/fpm/docker-php-ext-enable (100%) rename 8.5-rc/{bullseye => trixie}/fpm/docker-php-ext-install (100%) rename 8.5-rc/{bullseye => trixie}/fpm/docker-php-source (100%) rename 8.5-rc/{bullseye => trixie}/zts/Dockerfile (95%) rename 8.5-rc/{bullseye => trixie}/zts/docker-php-entrypoint (100%) rename 8.5-rc/{bullseye => trixie}/zts/docker-php-ext-configure (100%) rename 8.5-rc/{bullseye => trixie}/zts/docker-php-ext-enable (100%) rename 8.5-rc/{bullseye => trixie}/zts/docker-php-ext-install (100%) rename 8.5-rc/{bullseye => trixie}/zts/docker-php-source (100%) diff --git a/8.1/bookworm/apache/Dockerfile b/8.1/bookworm/apache/Dockerfile index cc0e01c7fb..1bb1d46384 100644 --- a/8.1/bookworm/apache/Dockerfile +++ b/8.1/bookworm/apache/Dockerfile @@ -263,8 +263,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.1/bookworm/cli/Dockerfile b/8.1/bookworm/cli/Dockerfile index 1dc6ba8744..006f194ddf 100644 --- a/8.1/bookworm/cli/Dockerfile +++ b/8.1/bookworm/cli/Dockerfile @@ -202,8 +202,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.1/bookworm/fpm/Dockerfile b/8.1/bookworm/fpm/Dockerfile index a31335c4f5..97421c9048 100644 --- a/8.1/bookworm/fpm/Dockerfile +++ b/8.1/bookworm/fpm/Dockerfile @@ -204,8 +204,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.1/bookworm/zts/Dockerfile b/8.1/bookworm/zts/Dockerfile index 010f92f94c..73e78be98d 100644 --- a/8.1/bookworm/zts/Dockerfile +++ b/8.1/bookworm/zts/Dockerfile @@ -207,8 +207,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.1/bullseye/apache/Dockerfile b/8.1/trixie/apache/Dockerfile similarity index 95% rename from 8.1/bullseye/apache/Dockerfile rename to 8.1/trixie/apache/Dockerfile index 30faf91074..a3dfec4f99 100644 --- a/8.1/bullseye/apache/Dockerfile +++ b/8.1/trixie/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -54,7 +54,7 @@ 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/*; \ + apt-get dist-clean; \ \ # generically convert lines like # export APACHE_RUN_USER=www-data @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ @@ -127,7 +129,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -261,13 +263,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1/bullseye/apache/apache2-foreground b/8.1/trixie/apache/apache2-foreground similarity index 100% rename from 8.1/bullseye/apache/apache2-foreground rename to 8.1/trixie/apache/apache2-foreground diff --git a/8.1/bullseye/apache/docker-php-entrypoint b/8.1/trixie/apache/docker-php-entrypoint similarity index 100% rename from 8.1/bullseye/apache/docker-php-entrypoint rename to 8.1/trixie/apache/docker-php-entrypoint diff --git a/8.1/bullseye/apache/docker-php-ext-configure b/8.1/trixie/apache/docker-php-ext-configure similarity index 100% rename from 8.1/bullseye/apache/docker-php-ext-configure rename to 8.1/trixie/apache/docker-php-ext-configure diff --git a/8.1/bullseye/apache/docker-php-ext-enable b/8.1/trixie/apache/docker-php-ext-enable similarity index 100% rename from 8.1/bullseye/apache/docker-php-ext-enable rename to 8.1/trixie/apache/docker-php-ext-enable diff --git a/8.1/bullseye/apache/docker-php-ext-install b/8.1/trixie/apache/docker-php-ext-install similarity index 100% rename from 8.1/bullseye/apache/docker-php-ext-install rename to 8.1/trixie/apache/docker-php-ext-install diff --git a/8.1/bullseye/apache/docker-php-source b/8.1/trixie/apache/docker-php-source similarity index 100% rename from 8.1/bullseye/apache/docker-php-source rename to 8.1/trixie/apache/docker-php-source diff --git a/8.1/bullseye/cli/Dockerfile b/8.1/trixie/cli/Dockerfile similarity index 95% rename from 8.1/bullseye/cli/Dockerfile rename to 8.1/trixie/cli/Dockerfile index dee60162e3..0aa7470614 100644 --- a/8.1/bullseye/cli/Dockerfile +++ b/8.1/trixie/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -202,13 +202,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1/bullseye/cli/docker-php-entrypoint b/8.1/trixie/cli/docker-php-entrypoint similarity index 100% rename from 8.1/bullseye/cli/docker-php-entrypoint rename to 8.1/trixie/cli/docker-php-entrypoint diff --git a/8.1/bullseye/cli/docker-php-ext-configure b/8.1/trixie/cli/docker-php-ext-configure similarity index 100% rename from 8.1/bullseye/cli/docker-php-ext-configure rename to 8.1/trixie/cli/docker-php-ext-configure diff --git a/8.1/bullseye/cli/docker-php-ext-enable b/8.1/trixie/cli/docker-php-ext-enable similarity index 100% rename from 8.1/bullseye/cli/docker-php-ext-enable rename to 8.1/trixie/cli/docker-php-ext-enable diff --git a/8.1/bullseye/cli/docker-php-ext-install b/8.1/trixie/cli/docker-php-ext-install similarity index 100% rename from 8.1/bullseye/cli/docker-php-ext-install rename to 8.1/trixie/cli/docker-php-ext-install diff --git a/8.1/bullseye/cli/docker-php-source b/8.1/trixie/cli/docker-php-source similarity index 100% rename from 8.1/bullseye/cli/docker-php-source rename to 8.1/trixie/cli/docker-php-source diff --git a/8.1/bullseye/fpm/Dockerfile b/8.1/trixie/fpm/Dockerfile similarity index 96% rename from 8.1/bullseye/fpm/Dockerfile rename to 8.1/trixie/fpm/Dockerfile index 73f53b4641..af842f2eb0 100644 --- a/8.1/bullseye/fpm/Dockerfile +++ b/8.1/trixie/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -204,13 +204,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1/bullseye/fpm/docker-php-entrypoint b/8.1/trixie/fpm/docker-php-entrypoint similarity index 100% rename from 8.1/bullseye/fpm/docker-php-entrypoint rename to 8.1/trixie/fpm/docker-php-entrypoint diff --git a/8.1/bullseye/fpm/docker-php-ext-configure b/8.1/trixie/fpm/docker-php-ext-configure similarity index 100% rename from 8.1/bullseye/fpm/docker-php-ext-configure rename to 8.1/trixie/fpm/docker-php-ext-configure diff --git a/8.1/bullseye/fpm/docker-php-ext-enable b/8.1/trixie/fpm/docker-php-ext-enable similarity index 100% rename from 8.1/bullseye/fpm/docker-php-ext-enable rename to 8.1/trixie/fpm/docker-php-ext-enable diff --git a/8.1/bullseye/fpm/docker-php-ext-install b/8.1/trixie/fpm/docker-php-ext-install similarity index 100% rename from 8.1/bullseye/fpm/docker-php-ext-install rename to 8.1/trixie/fpm/docker-php-ext-install diff --git a/8.1/bullseye/fpm/docker-php-source b/8.1/trixie/fpm/docker-php-source similarity index 100% rename from 8.1/bullseye/fpm/docker-php-source rename to 8.1/trixie/fpm/docker-php-source diff --git a/8.1/bullseye/zts/Dockerfile b/8.1/trixie/zts/Dockerfile similarity index 95% rename from 8.1/bullseye/zts/Dockerfile rename to 8.1/trixie/zts/Dockerfile index 6b5609ea56..30e6f4c271 100644 --- a/8.1/bullseye/zts/Dockerfile +++ b/8.1/trixie/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -207,13 +207,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.1/bullseye/zts/docker-php-entrypoint b/8.1/trixie/zts/docker-php-entrypoint similarity index 100% rename from 8.1/bullseye/zts/docker-php-entrypoint rename to 8.1/trixie/zts/docker-php-entrypoint diff --git a/8.1/bullseye/zts/docker-php-ext-configure b/8.1/trixie/zts/docker-php-ext-configure similarity index 100% rename from 8.1/bullseye/zts/docker-php-ext-configure rename to 8.1/trixie/zts/docker-php-ext-configure diff --git a/8.1/bullseye/zts/docker-php-ext-enable b/8.1/trixie/zts/docker-php-ext-enable similarity index 100% rename from 8.1/bullseye/zts/docker-php-ext-enable rename to 8.1/trixie/zts/docker-php-ext-enable diff --git a/8.1/bullseye/zts/docker-php-ext-install b/8.1/trixie/zts/docker-php-ext-install similarity index 100% rename from 8.1/bullseye/zts/docker-php-ext-install rename to 8.1/trixie/zts/docker-php-ext-install diff --git a/8.1/bullseye/zts/docker-php-source b/8.1/trixie/zts/docker-php-source similarity index 100% rename from 8.1/bullseye/zts/docker-php-source rename to 8.1/trixie/zts/docker-php-source diff --git a/8.2/bookworm/apache/Dockerfile b/8.2/bookworm/apache/Dockerfile index 66493fb05d..49c85c4c66 100644 --- a/8.2/bookworm/apache/Dockerfile +++ b/8.2/bookworm/apache/Dockerfile @@ -261,8 +261,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.2/bookworm/cli/Dockerfile b/8.2/bookworm/cli/Dockerfile index d643dbd1ca..29f7e7b7f0 100644 --- a/8.2/bookworm/cli/Dockerfile +++ b/8.2/bookworm/cli/Dockerfile @@ -200,8 +200,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.2/bookworm/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile index dc2032fcc2..124f4bef07 100644 --- a/8.2/bookworm/fpm/Dockerfile +++ b/8.2/bookworm/fpm/Dockerfile @@ -202,8 +202,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.2/bookworm/zts/Dockerfile b/8.2/bookworm/zts/Dockerfile index d61c7c47f0..88d124f6e6 100644 --- a/8.2/bookworm/zts/Dockerfile +++ b/8.2/bookworm/zts/Dockerfile @@ -205,8 +205,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.2/bullseye/apache/Dockerfile b/8.2/trixie/apache/Dockerfile similarity index 94% rename from 8.2/bullseye/apache/Dockerfile rename to 8.2/trixie/apache/Dockerfile index 072427b762..c8b3d92ac3 100644 --- a/8.2/bullseye/apache/Dockerfile +++ b/8.2/trixie/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -54,7 +54,7 @@ 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/*; \ + apt-get dist-clean; \ \ # generically convert lines like # export APACHE_RUN_USER=www-data @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ @@ -127,7 +129,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -259,13 +261,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.2/bullseye/apache/apache2-foreground b/8.2/trixie/apache/apache2-foreground similarity index 100% rename from 8.2/bullseye/apache/apache2-foreground rename to 8.2/trixie/apache/apache2-foreground diff --git a/8.2/bullseye/apache/docker-php-entrypoint b/8.2/trixie/apache/docker-php-entrypoint similarity index 100% rename from 8.2/bullseye/apache/docker-php-entrypoint rename to 8.2/trixie/apache/docker-php-entrypoint diff --git a/8.2/bullseye/apache/docker-php-ext-configure b/8.2/trixie/apache/docker-php-ext-configure similarity index 100% rename from 8.2/bullseye/apache/docker-php-ext-configure rename to 8.2/trixie/apache/docker-php-ext-configure diff --git a/8.2/bullseye/apache/docker-php-ext-enable b/8.2/trixie/apache/docker-php-ext-enable similarity index 100% rename from 8.2/bullseye/apache/docker-php-ext-enable rename to 8.2/trixie/apache/docker-php-ext-enable diff --git a/8.2/bullseye/apache/docker-php-ext-install b/8.2/trixie/apache/docker-php-ext-install similarity index 100% rename from 8.2/bullseye/apache/docker-php-ext-install rename to 8.2/trixie/apache/docker-php-ext-install diff --git a/8.2/bullseye/apache/docker-php-source b/8.2/trixie/apache/docker-php-source similarity index 100% rename from 8.2/bullseye/apache/docker-php-source rename to 8.2/trixie/apache/docker-php-source diff --git a/8.2/bullseye/cli/Dockerfile b/8.2/trixie/cli/Dockerfile similarity index 95% rename from 8.2/bullseye/cli/Dockerfile rename to 8.2/trixie/cli/Dockerfile index 65613aff9f..8d3f55ee0b 100644 --- a/8.2/bullseye/cli/Dockerfile +++ b/8.2/trixie/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -200,13 +200,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.2/bullseye/cli/docker-php-entrypoint b/8.2/trixie/cli/docker-php-entrypoint similarity index 100% rename from 8.2/bullseye/cli/docker-php-entrypoint rename to 8.2/trixie/cli/docker-php-entrypoint diff --git a/8.2/bullseye/cli/docker-php-ext-configure b/8.2/trixie/cli/docker-php-ext-configure similarity index 100% rename from 8.2/bullseye/cli/docker-php-ext-configure rename to 8.2/trixie/cli/docker-php-ext-configure diff --git a/8.2/bullseye/cli/docker-php-ext-enable b/8.2/trixie/cli/docker-php-ext-enable similarity index 100% rename from 8.2/bullseye/cli/docker-php-ext-enable rename to 8.2/trixie/cli/docker-php-ext-enable diff --git a/8.2/bullseye/cli/docker-php-ext-install b/8.2/trixie/cli/docker-php-ext-install similarity index 100% rename from 8.2/bullseye/cli/docker-php-ext-install rename to 8.2/trixie/cli/docker-php-ext-install diff --git a/8.2/bullseye/cli/docker-php-source b/8.2/trixie/cli/docker-php-source similarity index 100% rename from 8.2/bullseye/cli/docker-php-source rename to 8.2/trixie/cli/docker-php-source diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/trixie/fpm/Dockerfile similarity index 96% rename from 8.2/bullseye/fpm/Dockerfile rename to 8.2/trixie/fpm/Dockerfile index 9dd27cce41..1fc0a9d2a1 100644 --- a/8.2/bullseye/fpm/Dockerfile +++ b/8.2/trixie/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -202,13 +202,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.2/bullseye/fpm/docker-php-entrypoint b/8.2/trixie/fpm/docker-php-entrypoint similarity index 100% rename from 8.2/bullseye/fpm/docker-php-entrypoint rename to 8.2/trixie/fpm/docker-php-entrypoint diff --git a/8.2/bullseye/fpm/docker-php-ext-configure b/8.2/trixie/fpm/docker-php-ext-configure similarity index 100% rename from 8.2/bullseye/fpm/docker-php-ext-configure rename to 8.2/trixie/fpm/docker-php-ext-configure diff --git a/8.2/bullseye/fpm/docker-php-ext-enable b/8.2/trixie/fpm/docker-php-ext-enable similarity index 100% rename from 8.2/bullseye/fpm/docker-php-ext-enable rename to 8.2/trixie/fpm/docker-php-ext-enable diff --git a/8.2/bullseye/fpm/docker-php-ext-install b/8.2/trixie/fpm/docker-php-ext-install similarity index 100% rename from 8.2/bullseye/fpm/docker-php-ext-install rename to 8.2/trixie/fpm/docker-php-ext-install diff --git a/8.2/bullseye/fpm/docker-php-source b/8.2/trixie/fpm/docker-php-source similarity index 100% rename from 8.2/bullseye/fpm/docker-php-source rename to 8.2/trixie/fpm/docker-php-source diff --git a/8.2/bullseye/zts/Dockerfile b/8.2/trixie/zts/Dockerfile similarity index 95% rename from 8.2/bullseye/zts/Dockerfile rename to 8.2/trixie/zts/Dockerfile index c7eb4df57d..acbc0c95c1 100644 --- a/8.2/bullseye/zts/Dockerfile +++ b/8.2/trixie/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -205,13 +205,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.2/bullseye/zts/docker-php-entrypoint b/8.2/trixie/zts/docker-php-entrypoint similarity index 100% rename from 8.2/bullseye/zts/docker-php-entrypoint rename to 8.2/trixie/zts/docker-php-entrypoint diff --git a/8.2/bullseye/zts/docker-php-ext-configure b/8.2/trixie/zts/docker-php-ext-configure similarity index 100% rename from 8.2/bullseye/zts/docker-php-ext-configure rename to 8.2/trixie/zts/docker-php-ext-configure diff --git a/8.2/bullseye/zts/docker-php-ext-enable b/8.2/trixie/zts/docker-php-ext-enable similarity index 100% rename from 8.2/bullseye/zts/docker-php-ext-enable rename to 8.2/trixie/zts/docker-php-ext-enable diff --git a/8.2/bullseye/zts/docker-php-ext-install b/8.2/trixie/zts/docker-php-ext-install similarity index 100% rename from 8.2/bullseye/zts/docker-php-ext-install rename to 8.2/trixie/zts/docker-php-ext-install diff --git a/8.2/bullseye/zts/docker-php-source b/8.2/trixie/zts/docker-php-source similarity index 100% rename from 8.2/bullseye/zts/docker-php-source rename to 8.2/trixie/zts/docker-php-source diff --git a/8.3/bookworm/apache/Dockerfile b/8.3/bookworm/apache/Dockerfile index 61dcaf6f9a..d5a2c58986 100644 --- a/8.3/bookworm/apache/Dockerfile +++ b/8.3/bookworm/apache/Dockerfile @@ -257,8 +257,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.3/bookworm/cli/Dockerfile b/8.3/bookworm/cli/Dockerfile index 89997cbacd..70fea8797e 100644 --- a/8.3/bookworm/cli/Dockerfile +++ b/8.3/bookworm/cli/Dockerfile @@ -196,8 +196,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.3/bookworm/fpm/Dockerfile b/8.3/bookworm/fpm/Dockerfile index ac5d3b9b01..0e49ee7e48 100644 --- a/8.3/bookworm/fpm/Dockerfile +++ b/8.3/bookworm/fpm/Dockerfile @@ -198,8 +198,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.3/bookworm/zts/Dockerfile b/8.3/bookworm/zts/Dockerfile index 24a65f672e..b689a4ed7e 100644 --- a/8.3/bookworm/zts/Dockerfile +++ b/8.3/bookworm/zts/Dockerfile @@ -200,8 +200,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.3/bullseye/apache/Dockerfile b/8.3/trixie/apache/Dockerfile similarity index 94% rename from 8.3/bullseye/apache/Dockerfile rename to 8.3/trixie/apache/Dockerfile index aa8518bc0e..e79e1220e6 100644 --- a/8.3/bullseye/apache/Dockerfile +++ b/8.3/trixie/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -54,7 +54,7 @@ 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/*; \ + apt-get dist-clean; \ \ # generically convert lines like # export APACHE_RUN_USER=www-data @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ @@ -127,7 +129,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -255,13 +257,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.3/bullseye/apache/apache2-foreground b/8.3/trixie/apache/apache2-foreground similarity index 100% rename from 8.3/bullseye/apache/apache2-foreground rename to 8.3/trixie/apache/apache2-foreground diff --git a/8.3/bullseye/apache/docker-php-entrypoint b/8.3/trixie/apache/docker-php-entrypoint similarity index 100% rename from 8.3/bullseye/apache/docker-php-entrypoint rename to 8.3/trixie/apache/docker-php-entrypoint diff --git a/8.3/bullseye/apache/docker-php-ext-configure b/8.3/trixie/apache/docker-php-ext-configure similarity index 100% rename from 8.3/bullseye/apache/docker-php-ext-configure rename to 8.3/trixie/apache/docker-php-ext-configure diff --git a/8.3/bullseye/apache/docker-php-ext-enable b/8.3/trixie/apache/docker-php-ext-enable similarity index 100% rename from 8.3/bullseye/apache/docker-php-ext-enable rename to 8.3/trixie/apache/docker-php-ext-enable diff --git a/8.3/bullseye/apache/docker-php-ext-install b/8.3/trixie/apache/docker-php-ext-install similarity index 100% rename from 8.3/bullseye/apache/docker-php-ext-install rename to 8.3/trixie/apache/docker-php-ext-install diff --git a/8.3/bullseye/apache/docker-php-source b/8.3/trixie/apache/docker-php-source similarity index 100% rename from 8.3/bullseye/apache/docker-php-source rename to 8.3/trixie/apache/docker-php-source diff --git a/8.3/bullseye/cli/Dockerfile b/8.3/trixie/cli/Dockerfile similarity index 95% rename from 8.3/bullseye/cli/Dockerfile rename to 8.3/trixie/cli/Dockerfile index eed639e9c1..623bb09721 100644 --- a/8.3/bullseye/cli/Dockerfile +++ b/8.3/trixie/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -196,13 +196,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.3/bullseye/cli/docker-php-entrypoint b/8.3/trixie/cli/docker-php-entrypoint similarity index 100% rename from 8.3/bullseye/cli/docker-php-entrypoint rename to 8.3/trixie/cli/docker-php-entrypoint diff --git a/8.3/bullseye/cli/docker-php-ext-configure b/8.3/trixie/cli/docker-php-ext-configure similarity index 100% rename from 8.3/bullseye/cli/docker-php-ext-configure rename to 8.3/trixie/cli/docker-php-ext-configure diff --git a/8.3/bullseye/cli/docker-php-ext-enable b/8.3/trixie/cli/docker-php-ext-enable similarity index 100% rename from 8.3/bullseye/cli/docker-php-ext-enable rename to 8.3/trixie/cli/docker-php-ext-enable diff --git a/8.3/bullseye/cli/docker-php-ext-install b/8.3/trixie/cli/docker-php-ext-install similarity index 100% rename from 8.3/bullseye/cli/docker-php-ext-install rename to 8.3/trixie/cli/docker-php-ext-install diff --git a/8.3/bullseye/cli/docker-php-source b/8.3/trixie/cli/docker-php-source similarity index 100% rename from 8.3/bullseye/cli/docker-php-source rename to 8.3/trixie/cli/docker-php-source diff --git a/8.3/bullseye/fpm/Dockerfile b/8.3/trixie/fpm/Dockerfile similarity index 96% rename from 8.3/bullseye/fpm/Dockerfile rename to 8.3/trixie/fpm/Dockerfile index 1e0288ca88..f0cd9c9246 100644 --- a/8.3/bullseye/fpm/Dockerfile +++ b/8.3/trixie/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -198,13 +198,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.3/bullseye/fpm/docker-php-entrypoint b/8.3/trixie/fpm/docker-php-entrypoint similarity index 100% rename from 8.3/bullseye/fpm/docker-php-entrypoint rename to 8.3/trixie/fpm/docker-php-entrypoint diff --git a/8.3/bullseye/fpm/docker-php-ext-configure b/8.3/trixie/fpm/docker-php-ext-configure similarity index 100% rename from 8.3/bullseye/fpm/docker-php-ext-configure rename to 8.3/trixie/fpm/docker-php-ext-configure diff --git a/8.3/bullseye/fpm/docker-php-ext-enable b/8.3/trixie/fpm/docker-php-ext-enable similarity index 100% rename from 8.3/bullseye/fpm/docker-php-ext-enable rename to 8.3/trixie/fpm/docker-php-ext-enable diff --git a/8.3/bullseye/fpm/docker-php-ext-install b/8.3/trixie/fpm/docker-php-ext-install similarity index 100% rename from 8.3/bullseye/fpm/docker-php-ext-install rename to 8.3/trixie/fpm/docker-php-ext-install diff --git a/8.3/bullseye/fpm/docker-php-source b/8.3/trixie/fpm/docker-php-source similarity index 100% rename from 8.3/bullseye/fpm/docker-php-source rename to 8.3/trixie/fpm/docker-php-source diff --git a/8.3/bullseye/zts/Dockerfile b/8.3/trixie/zts/Dockerfile similarity index 95% rename from 8.3/bullseye/zts/Dockerfile rename to 8.3/trixie/zts/Dockerfile index 229b36d1df..934c341f02 100644 --- a/8.3/bullseye/zts/Dockerfile +++ b/8.3/trixie/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -200,13 +200,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.3/bullseye/zts/docker-php-entrypoint b/8.3/trixie/zts/docker-php-entrypoint similarity index 100% rename from 8.3/bullseye/zts/docker-php-entrypoint rename to 8.3/trixie/zts/docker-php-entrypoint diff --git a/8.3/bullseye/zts/docker-php-ext-configure b/8.3/trixie/zts/docker-php-ext-configure similarity index 100% rename from 8.3/bullseye/zts/docker-php-ext-configure rename to 8.3/trixie/zts/docker-php-ext-configure diff --git a/8.3/bullseye/zts/docker-php-ext-enable b/8.3/trixie/zts/docker-php-ext-enable similarity index 100% rename from 8.3/bullseye/zts/docker-php-ext-enable rename to 8.3/trixie/zts/docker-php-ext-enable diff --git a/8.3/bullseye/zts/docker-php-ext-install b/8.3/trixie/zts/docker-php-ext-install similarity index 100% rename from 8.3/bullseye/zts/docker-php-ext-install rename to 8.3/trixie/zts/docker-php-ext-install diff --git a/8.3/bullseye/zts/docker-php-source b/8.3/trixie/zts/docker-php-source similarity index 100% rename from 8.3/bullseye/zts/docker-php-source rename to 8.3/trixie/zts/docker-php-source diff --git a/8.4/bookworm/apache/Dockerfile b/8.4/bookworm/apache/Dockerfile index 7c51bcc417..68b422c20d 100644 --- a/8.4/bookworm/apache/Dockerfile +++ b/8.4/bookworm/apache/Dockerfile @@ -257,8 +257,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.4/bookworm/cli/Dockerfile b/8.4/bookworm/cli/Dockerfile index e636bbe713..e129149317 100644 --- a/8.4/bookworm/cli/Dockerfile +++ b/8.4/bookworm/cli/Dockerfile @@ -196,8 +196,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.4/bookworm/fpm/Dockerfile b/8.4/bookworm/fpm/Dockerfile index eae45ed852..44f4efd469 100644 --- a/8.4/bookworm/fpm/Dockerfile +++ b/8.4/bookworm/fpm/Dockerfile @@ -198,8 +198,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.4/bookworm/zts/Dockerfile b/8.4/bookworm/zts/Dockerfile index ee22919c0b..ca6b90535d 100644 --- a/8.4/bookworm/zts/Dockerfile +++ b/8.4/bookworm/zts/Dockerfile @@ -200,8 +200,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.4/bullseye/apache/Dockerfile b/8.4/trixie/apache/Dockerfile similarity index 94% rename from 8.4/bullseye/apache/Dockerfile rename to 8.4/trixie/apache/Dockerfile index b8a82cf7fa..d5d83a2161 100644 --- a/8.4/bullseye/apache/Dockerfile +++ b/8.4/trixie/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -54,7 +54,7 @@ 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/*; \ + apt-get dist-clean; \ \ # generically convert lines like # export APACHE_RUN_USER=www-data @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ @@ -127,7 +129,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -255,13 +257,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.4/bullseye/apache/apache2-foreground b/8.4/trixie/apache/apache2-foreground similarity index 100% rename from 8.4/bullseye/apache/apache2-foreground rename to 8.4/trixie/apache/apache2-foreground diff --git a/8.4/bullseye/apache/docker-php-entrypoint b/8.4/trixie/apache/docker-php-entrypoint similarity index 100% rename from 8.4/bullseye/apache/docker-php-entrypoint rename to 8.4/trixie/apache/docker-php-entrypoint diff --git a/8.4/bullseye/apache/docker-php-ext-configure b/8.4/trixie/apache/docker-php-ext-configure similarity index 100% rename from 8.4/bullseye/apache/docker-php-ext-configure rename to 8.4/trixie/apache/docker-php-ext-configure diff --git a/8.4/bullseye/apache/docker-php-ext-enable b/8.4/trixie/apache/docker-php-ext-enable similarity index 100% rename from 8.4/bullseye/apache/docker-php-ext-enable rename to 8.4/trixie/apache/docker-php-ext-enable diff --git a/8.4/bullseye/apache/docker-php-ext-install b/8.4/trixie/apache/docker-php-ext-install similarity index 100% rename from 8.4/bullseye/apache/docker-php-ext-install rename to 8.4/trixie/apache/docker-php-ext-install diff --git a/8.4/bullseye/apache/docker-php-source b/8.4/trixie/apache/docker-php-source similarity index 100% rename from 8.4/bullseye/apache/docker-php-source rename to 8.4/trixie/apache/docker-php-source diff --git a/8.4/bullseye/cli/Dockerfile b/8.4/trixie/cli/Dockerfile similarity index 95% rename from 8.4/bullseye/cli/Dockerfile rename to 8.4/trixie/cli/Dockerfile index 3ba0bc44da..a3952872bd 100644 --- a/8.4/bullseye/cli/Dockerfile +++ b/8.4/trixie/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -196,13 +196,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.4/bullseye/cli/docker-php-entrypoint b/8.4/trixie/cli/docker-php-entrypoint similarity index 100% rename from 8.4/bullseye/cli/docker-php-entrypoint rename to 8.4/trixie/cli/docker-php-entrypoint diff --git a/8.4/bullseye/cli/docker-php-ext-configure b/8.4/trixie/cli/docker-php-ext-configure similarity index 100% rename from 8.4/bullseye/cli/docker-php-ext-configure rename to 8.4/trixie/cli/docker-php-ext-configure diff --git a/8.4/bullseye/cli/docker-php-ext-enable b/8.4/trixie/cli/docker-php-ext-enable similarity index 100% rename from 8.4/bullseye/cli/docker-php-ext-enable rename to 8.4/trixie/cli/docker-php-ext-enable diff --git a/8.4/bullseye/cli/docker-php-ext-install b/8.4/trixie/cli/docker-php-ext-install similarity index 100% rename from 8.4/bullseye/cli/docker-php-ext-install rename to 8.4/trixie/cli/docker-php-ext-install diff --git a/8.4/bullseye/cli/docker-php-source b/8.4/trixie/cli/docker-php-source similarity index 100% rename from 8.4/bullseye/cli/docker-php-source rename to 8.4/trixie/cli/docker-php-source diff --git a/8.4/bullseye/fpm/Dockerfile b/8.4/trixie/fpm/Dockerfile similarity index 96% rename from 8.4/bullseye/fpm/Dockerfile rename to 8.4/trixie/fpm/Dockerfile index 896ac7349c..d5d0fe8654 100644 --- a/8.4/bullseye/fpm/Dockerfile +++ b/8.4/trixie/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -198,13 +198,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.4/bullseye/fpm/docker-php-entrypoint b/8.4/trixie/fpm/docker-php-entrypoint similarity index 100% rename from 8.4/bullseye/fpm/docker-php-entrypoint rename to 8.4/trixie/fpm/docker-php-entrypoint diff --git a/8.4/bullseye/fpm/docker-php-ext-configure b/8.4/trixie/fpm/docker-php-ext-configure similarity index 100% rename from 8.4/bullseye/fpm/docker-php-ext-configure rename to 8.4/trixie/fpm/docker-php-ext-configure diff --git a/8.4/bullseye/fpm/docker-php-ext-enable b/8.4/trixie/fpm/docker-php-ext-enable similarity index 100% rename from 8.4/bullseye/fpm/docker-php-ext-enable rename to 8.4/trixie/fpm/docker-php-ext-enable diff --git a/8.4/bullseye/fpm/docker-php-ext-install b/8.4/trixie/fpm/docker-php-ext-install similarity index 100% rename from 8.4/bullseye/fpm/docker-php-ext-install rename to 8.4/trixie/fpm/docker-php-ext-install diff --git a/8.4/bullseye/fpm/docker-php-source b/8.4/trixie/fpm/docker-php-source similarity index 100% rename from 8.4/bullseye/fpm/docker-php-source rename to 8.4/trixie/fpm/docker-php-source diff --git a/8.4/bullseye/zts/Dockerfile b/8.4/trixie/zts/Dockerfile similarity index 95% rename from 8.4/bullseye/zts/Dockerfile rename to 8.4/trixie/zts/Dockerfile index b87b87d498..33417fac1f 100644 --- a/8.4/bullseye/zts/Dockerfile +++ b/8.4/trixie/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -200,13 +200,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.4/bullseye/zts/docker-php-entrypoint b/8.4/trixie/zts/docker-php-entrypoint similarity index 100% rename from 8.4/bullseye/zts/docker-php-entrypoint rename to 8.4/trixie/zts/docker-php-entrypoint diff --git a/8.4/bullseye/zts/docker-php-ext-configure b/8.4/trixie/zts/docker-php-ext-configure similarity index 100% rename from 8.4/bullseye/zts/docker-php-ext-configure rename to 8.4/trixie/zts/docker-php-ext-configure diff --git a/8.4/bullseye/zts/docker-php-ext-enable b/8.4/trixie/zts/docker-php-ext-enable similarity index 100% rename from 8.4/bullseye/zts/docker-php-ext-enable rename to 8.4/trixie/zts/docker-php-ext-enable diff --git a/8.4/bullseye/zts/docker-php-ext-install b/8.4/trixie/zts/docker-php-ext-install similarity index 100% rename from 8.4/bullseye/zts/docker-php-ext-install rename to 8.4/trixie/zts/docker-php-ext-install diff --git a/8.4/bullseye/zts/docker-php-source b/8.4/trixie/zts/docker-php-source similarity index 100% rename from 8.4/bullseye/zts/docker-php-source rename to 8.4/trixie/zts/docker-php-source diff --git a/8.5-rc/bookworm/apache/Dockerfile b/8.5-rc/bookworm/apache/Dockerfile index bb5503eaf9..88bc129927 100644 --- a/8.5-rc/bookworm/apache/Dockerfile +++ b/8.5-rc/bookworm/apache/Dockerfile @@ -257,8 +257,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.5-rc/bookworm/cli/Dockerfile b/8.5-rc/bookworm/cli/Dockerfile index 094613a330..a5bb3d7093 100644 --- a/8.5-rc/bookworm/cli/Dockerfile +++ b/8.5-rc/bookworm/cli/Dockerfile @@ -196,8 +196,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.5-rc/bookworm/fpm/Dockerfile b/8.5-rc/bookworm/fpm/Dockerfile index 6731b87106..f396894e85 100644 --- a/8.5-rc/bookworm/fpm/Dockerfile +++ b/8.5-rc/bookworm/fpm/Dockerfile @@ -198,8 +198,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.5-rc/bookworm/zts/Dockerfile b/8.5-rc/bookworm/zts/Dockerfile index 1b7e68361d..3f33b979e4 100644 --- a/8.5-rc/bookworm/zts/Dockerfile +++ b/8.5-rc/bookworm/zts/Dockerfile @@ -200,8 +200,9 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/8.5-rc/bullseye/apache/Dockerfile b/8.5-rc/trixie/apache/Dockerfile similarity index 94% rename from 8.5-rc/bullseye/apache/Dockerfile rename to 8.5-rc/trixie/apache/Dockerfile index d1c50e3887..a208f9dfee 100644 --- a/8.5-rc/bullseye/apache/Dockerfile +++ b/8.5-rc/trixie/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -54,7 +54,7 @@ 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/*; \ + apt-get dist-clean; \ \ # generically convert lines like # export APACHE_RUN_USER=www-data @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ @@ -127,7 +129,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -255,13 +257,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.5-rc/bullseye/apache/apache2-foreground b/8.5-rc/trixie/apache/apache2-foreground similarity index 100% rename from 8.5-rc/bullseye/apache/apache2-foreground rename to 8.5-rc/trixie/apache/apache2-foreground diff --git a/8.5-rc/bullseye/apache/docker-php-entrypoint b/8.5-rc/trixie/apache/docker-php-entrypoint similarity index 100% rename from 8.5-rc/bullseye/apache/docker-php-entrypoint rename to 8.5-rc/trixie/apache/docker-php-entrypoint diff --git a/8.5-rc/bullseye/apache/docker-php-ext-configure b/8.5-rc/trixie/apache/docker-php-ext-configure similarity index 100% rename from 8.5-rc/bullseye/apache/docker-php-ext-configure rename to 8.5-rc/trixie/apache/docker-php-ext-configure diff --git a/8.5-rc/bullseye/apache/docker-php-ext-enable b/8.5-rc/trixie/apache/docker-php-ext-enable similarity index 100% rename from 8.5-rc/bullseye/apache/docker-php-ext-enable rename to 8.5-rc/trixie/apache/docker-php-ext-enable diff --git a/8.5-rc/bullseye/apache/docker-php-ext-install b/8.5-rc/trixie/apache/docker-php-ext-install similarity index 100% rename from 8.5-rc/bullseye/apache/docker-php-ext-install rename to 8.5-rc/trixie/apache/docker-php-ext-install diff --git a/8.5-rc/bullseye/apache/docker-php-source b/8.5-rc/trixie/apache/docker-php-source similarity index 100% rename from 8.5-rc/bullseye/apache/docker-php-source rename to 8.5-rc/trixie/apache/docker-php-source diff --git a/8.5-rc/bullseye/cli/Dockerfile b/8.5-rc/trixie/cli/Dockerfile similarity index 95% rename from 8.5-rc/bullseye/cli/Dockerfile rename to 8.5-rc/trixie/cli/Dockerfile index f008aea36c..8e6187fcb1 100644 --- a/8.5-rc/bullseye/cli/Dockerfile +++ b/8.5-rc/trixie/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -196,13 +196,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.5-rc/bullseye/cli/docker-php-entrypoint b/8.5-rc/trixie/cli/docker-php-entrypoint similarity index 100% rename from 8.5-rc/bullseye/cli/docker-php-entrypoint rename to 8.5-rc/trixie/cli/docker-php-entrypoint diff --git a/8.5-rc/bullseye/cli/docker-php-ext-configure b/8.5-rc/trixie/cli/docker-php-ext-configure similarity index 100% rename from 8.5-rc/bullseye/cli/docker-php-ext-configure rename to 8.5-rc/trixie/cli/docker-php-ext-configure diff --git a/8.5-rc/bullseye/cli/docker-php-ext-enable b/8.5-rc/trixie/cli/docker-php-ext-enable similarity index 100% rename from 8.5-rc/bullseye/cli/docker-php-ext-enable rename to 8.5-rc/trixie/cli/docker-php-ext-enable diff --git a/8.5-rc/bullseye/cli/docker-php-ext-install b/8.5-rc/trixie/cli/docker-php-ext-install similarity index 100% rename from 8.5-rc/bullseye/cli/docker-php-ext-install rename to 8.5-rc/trixie/cli/docker-php-ext-install diff --git a/8.5-rc/bullseye/cli/docker-php-source b/8.5-rc/trixie/cli/docker-php-source similarity index 100% rename from 8.5-rc/bullseye/cli/docker-php-source rename to 8.5-rc/trixie/cli/docker-php-source diff --git a/8.5-rc/bullseye/fpm/Dockerfile b/8.5-rc/trixie/fpm/Dockerfile similarity index 96% rename from 8.5-rc/bullseye/fpm/Dockerfile rename to 8.5-rc/trixie/fpm/Dockerfile index d041f8c9dc..aac127af15 100644 --- a/8.5-rc/bullseye/fpm/Dockerfile +++ b/8.5-rc/trixie/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -198,13 +198,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.5-rc/bullseye/fpm/docker-php-entrypoint b/8.5-rc/trixie/fpm/docker-php-entrypoint similarity index 100% rename from 8.5-rc/bullseye/fpm/docker-php-entrypoint rename to 8.5-rc/trixie/fpm/docker-php-entrypoint diff --git a/8.5-rc/bullseye/fpm/docker-php-ext-configure b/8.5-rc/trixie/fpm/docker-php-ext-configure similarity index 100% rename from 8.5-rc/bullseye/fpm/docker-php-ext-configure rename to 8.5-rc/trixie/fpm/docker-php-ext-configure diff --git a/8.5-rc/bullseye/fpm/docker-php-ext-enable b/8.5-rc/trixie/fpm/docker-php-ext-enable similarity index 100% rename from 8.5-rc/bullseye/fpm/docker-php-ext-enable rename to 8.5-rc/trixie/fpm/docker-php-ext-enable diff --git a/8.5-rc/bullseye/fpm/docker-php-ext-install b/8.5-rc/trixie/fpm/docker-php-ext-install similarity index 100% rename from 8.5-rc/bullseye/fpm/docker-php-ext-install rename to 8.5-rc/trixie/fpm/docker-php-ext-install diff --git a/8.5-rc/bullseye/fpm/docker-php-source b/8.5-rc/trixie/fpm/docker-php-source similarity index 100% rename from 8.5-rc/bullseye/fpm/docker-php-source rename to 8.5-rc/trixie/fpm/docker-php-source diff --git a/8.5-rc/bullseye/zts/Dockerfile b/8.5-rc/trixie/zts/Dockerfile similarity index 95% rename from 8.5-rc/bullseye/zts/Dockerfile rename to 8.5-rc/trixie/zts/Dockerfile index 290324bf7f..95612c3d15 100644 --- a/8.5-rc/bullseye/zts/Dockerfile +++ b/8.5-rc/trixie/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -37,7 +37,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean ENV PHP_INI_DIR /usr/local/etc/php RUN set -eux; \ @@ -69,7 +69,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /usr/src; \ cd /usr/src; \ @@ -200,13 +200,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 pecl update-channels; \ diff --git a/8.5-rc/bullseye/zts/docker-php-entrypoint b/8.5-rc/trixie/zts/docker-php-entrypoint similarity index 100% rename from 8.5-rc/bullseye/zts/docker-php-entrypoint rename to 8.5-rc/trixie/zts/docker-php-entrypoint diff --git a/8.5-rc/bullseye/zts/docker-php-ext-configure b/8.5-rc/trixie/zts/docker-php-ext-configure similarity index 100% rename from 8.5-rc/bullseye/zts/docker-php-ext-configure rename to 8.5-rc/trixie/zts/docker-php-ext-configure diff --git a/8.5-rc/bullseye/zts/docker-php-ext-enable b/8.5-rc/trixie/zts/docker-php-ext-enable similarity index 100% rename from 8.5-rc/bullseye/zts/docker-php-ext-enable rename to 8.5-rc/trixie/zts/docker-php-ext-enable diff --git a/8.5-rc/bullseye/zts/docker-php-ext-install b/8.5-rc/trixie/zts/docker-php-ext-install similarity index 100% rename from 8.5-rc/bullseye/zts/docker-php-ext-install rename to 8.5-rc/trixie/zts/docker-php-ext-install diff --git a/8.5-rc/bullseye/zts/docker-php-source b/8.5-rc/trixie/zts/docker-php-source similarity index 100% rename from 8.5-rc/bullseye/zts/docker-php-source rename to 8.5-rc/trixie/zts/docker-php-source diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 2202f554b5..38d3f12a4b 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -16,6 +16,12 @@ def rcVersion: env.version | rtrimstr("-rc") ; + def clean_apt: + # TODO once bookworm is EOL, remove this and just hard-code "apt-get dist-clean" instead + if env.from | contains("bookworm") then + "rm -rf /var/lib/apt/lists/*" + else "apt-get dist-clean" end + ; def need_patch_11678: # https://github.com/docker-library/php/pull/1552 # https://github.com/php/php-src/issues/11678 "Build fails on musl 1.2.4 - lfs64" stream_cookie_seeker @@ -85,7 +91,7 @@ RUN set -eux; \ curl \ xz-utils \ ; \ - rm -rf /var/lib/apt/lists/* + {{ clean_apt }} {{ ) end -}} ENV PHP_INI_DIR /usr/local/etc/php @@ -104,7 +110,7 @@ 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/*; \ + {{ clean_apt }}; \ \ # generically convert lines like # export APACHE_RUN_USER=www-data @@ -120,10 +126,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ -{{ if env.suite == "bullseye" then "" else ( -}} # https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 "$APACHE_RUN_DIR/socks" \ -{{ ) end -}} ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ @@ -232,7 +236,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ + {{ clean_apt }}; \ {{ ) end -}} \ mkdir -p /usr/src; \ @@ -500,13 +504,14 @@ RUN set -eux; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ + | xargs -rt dpkg-query --search \ +# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + {{ clean_apt }}; \ {{ ) end -}} \ # update pecl channel definitions https://github.com/docker-library/php/issues/443 diff --git a/versions.json b/versions.json index e8656b2886..c57c1fb212 100644 --- a/versions.json +++ b/versions.json @@ -5,14 +5,14 @@ "ascUrl": "https://www.php.net/distributions/php-8.1.33.tar.xz.asc", "sha256": "9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1", "variants": [ + "trixie/cli", + "trixie/apache", + "trixie/fpm", + "trixie/zts", "bookworm/cli", "bookworm/apache", "bookworm/fpm", "bookworm/zts", - "bullseye/cli", - "bullseye/apache", - "bullseye/fpm", - "bullseye/zts", "alpine3.22/cli", "alpine3.22/fpm", "alpine3.22/zts", @@ -28,14 +28,14 @@ "ascUrl": "https://www.php.net/distributions/php-8.2.29.tar.xz.asc", "sha256": "475f991afd2d5b901fb410be407d929bc00c46285d3f439a02c59e8b6fe3589c", "variants": [ + "trixie/cli", + "trixie/apache", + "trixie/fpm", + "trixie/zts", "bookworm/cli", "bookworm/apache", "bookworm/fpm", "bookworm/zts", - "bullseye/cli", - "bullseye/apache", - "bullseye/fpm", - "bullseye/zts", "alpine3.22/cli", "alpine3.22/fpm", "alpine3.22/zts", @@ -51,14 +51,14 @@ "ascUrl": "https://www.php.net/distributions/php-8.3.24.tar.xz.asc", "sha256": "388ee5fd111097e97bae439bff46aec4ea27f816d3f0c2cb5490a41410d44251", "variants": [ + "trixie/cli", + "trixie/apache", + "trixie/fpm", + "trixie/zts", "bookworm/cli", "bookworm/apache", "bookworm/fpm", "bookworm/zts", - "bullseye/cli", - "bullseye/apache", - "bullseye/fpm", - "bullseye/zts", "alpine3.22/cli", "alpine3.22/fpm", "alpine3.22/zts", @@ -74,14 +74,14 @@ "ascUrl": "https://www.php.net/distributions/php-8.4.11.tar.xz.asc", "sha256": "04cd331380a8683a5c2503938eb51764d48d507c53ad4208d2c82e0eed779a00", "variants": [ + "trixie/cli", + "trixie/apache", + "trixie/fpm", + "trixie/zts", "bookworm/cli", "bookworm/apache", "bookworm/fpm", "bookworm/zts", - "bullseye/cli", - "bullseye/apache", - "bullseye/fpm", - "bullseye/zts", "alpine3.22/cli", "alpine3.22/fpm", "alpine3.22/zts", @@ -97,14 +97,14 @@ "ascUrl": "https://downloads.php.net/~daniels/php-8.5.0alpha4.tar.xz.asc", "sha256": "5d33e15942d89956814f1521540210c58174c7f72dd277deda6b99709173e2db", "variants": [ + "trixie/cli", + "trixie/apache", + "trixie/fpm", + "trixie/zts", "bookworm/cli", "bookworm/apache", "bookworm/fpm", "bookworm/zts", - "bullseye/cli", - "bullseye/apache", - "bullseye/fpm", - "bullseye/zts", "alpine3.22/cli", "alpine3.22/fpm", "alpine3.22/zts", diff --git a/versions.sh b/versions.sh index 194571c65c..02a790629a 100755 --- a/versions.sh +++ b/versions.sh @@ -80,8 +80,8 @@ for version in "${versions[@]}"; do variants='[]' # order here controls the order of the library/ file for suite in \ + trixie \ bookworm \ - bullseye \ alpine3.22 \ alpine3.21 \ ; do