From 7838b365f3262d70e7b164ffae852407a7a990b7 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Tue, 13 Jun 2023 12:01:39 -0700 Subject: [PATCH] Add Debian bookworm, remove buster Except 8.0 that doesn't support OpenSSL 3.x --- 8.0/bullseye/apache/Dockerfile | 2 +- 8.0/bullseye/cli/Dockerfile | 2 +- 8.0/bullseye/fpm/Dockerfile | 2 +- 8.0/bullseye/zts/Dockerfile | 2 +- 8.0/buster/apache/Dockerfile | 2 +- 8.0/buster/cli/Dockerfile | 2 +- 8.0/buster/fpm/Dockerfile | 2 +- 8.0/buster/zts/Dockerfile | 2 +- 8.1/{buster => bookworm}/apache/Dockerfile | 4 ++-- .../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/{buster => bookworm}/cli/Dockerfile | 4 ++-- .../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/{buster => bookworm}/fpm/Dockerfile | 4 ++-- .../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/{buster => bookworm}/zts/Dockerfile | 4 ++-- .../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.1/bullseye/apache/Dockerfile | 2 +- 8.1/bullseye/cli/Dockerfile | 2 +- 8.1/bullseye/fpm/Dockerfile | 2 +- 8.1/bullseye/zts/Dockerfile | 2 +- 8.2/{buster => bookworm}/apache/Dockerfile | 4 ++-- .../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/{buster => bookworm}/cli/Dockerfile | 4 ++-- .../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/{buster => bookworm}/fpm/Dockerfile | 4 ++-- .../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/{buster => bookworm}/zts/Dockerfile | 4 ++-- .../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/bullseye/apache/Dockerfile | 2 +- 8.2/bullseye/cli/Dockerfile | 2 +- 8.2/bullseye/fpm/Dockerfile | 2 +- 8.2/bullseye/zts/Dockerfile | 2 +- 8.3-rc/{buster => bookworm}/apache/Dockerfile | 4 ++-- .../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-rc/{buster => bookworm}/cli/Dockerfile | 4 ++-- .../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-rc/{buster => bookworm}/fpm/Dockerfile | 4 ++-- .../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-rc/{buster => bookworm}/zts/Dockerfile | 4 ++-- .../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-rc/bullseye/apache/Dockerfile | 2 +- 8.3-rc/bullseye/cli/Dockerfile | 2 +- 8.3-rc/bullseye/fpm/Dockerfile | 2 +- 8.3-rc/bullseye/zts/Dockerfile | 2 +- Dockerfile-linux.template | 2 +- versions.json | 24 +++++++++---------- versions.sh | 8 +++++++ 98 files changed, 65 insertions(+), 57 deletions(-) rename 8.1/{buster => bookworm}/apache/Dockerfile (98%) rename 8.1/{buster => bookworm}/apache/apache2-foreground (100%) rename 8.1/{buster => bookworm}/apache/docker-php-entrypoint (100%) rename 8.1/{buster => bookworm}/apache/docker-php-ext-configure (100%) rename 8.1/{buster => bookworm}/apache/docker-php-ext-enable (100%) rename 8.1/{buster => bookworm}/apache/docker-php-ext-install (100%) rename 8.1/{buster => bookworm}/apache/docker-php-source (100%) rename 8.1/{buster => bookworm}/cli/Dockerfile (98%) rename 8.1/{buster => bookworm}/cli/docker-php-entrypoint (100%) rename 8.1/{buster => bookworm}/cli/docker-php-ext-configure (100%) rename 8.1/{buster => bookworm}/cli/docker-php-ext-enable (100%) rename 8.1/{buster => bookworm}/cli/docker-php-ext-install (100%) rename 8.1/{buster => bookworm}/cli/docker-php-source (100%) rename 8.1/{buster => bookworm}/fpm/Dockerfile (98%) rename 8.1/{buster => bookworm}/fpm/docker-php-entrypoint (100%) rename 8.1/{buster => bookworm}/fpm/docker-php-ext-configure (100%) rename 8.1/{buster => bookworm}/fpm/docker-php-ext-enable (100%) rename 8.1/{buster => bookworm}/fpm/docker-php-ext-install (100%) rename 8.1/{buster => bookworm}/fpm/docker-php-source (100%) rename 8.1/{buster => bookworm}/zts/Dockerfile (98%) rename 8.1/{buster => bookworm}/zts/docker-php-entrypoint (100%) rename 8.1/{buster => bookworm}/zts/docker-php-ext-configure (100%) rename 8.1/{buster => bookworm}/zts/docker-php-ext-enable (100%) rename 8.1/{buster => bookworm}/zts/docker-php-ext-install (100%) rename 8.1/{buster => bookworm}/zts/docker-php-source (100%) rename 8.2/{buster => bookworm}/apache/Dockerfile (98%) rename 8.2/{buster => bookworm}/apache/apache2-foreground (100%) rename 8.2/{buster => bookworm}/apache/docker-php-entrypoint (100%) rename 8.2/{buster => bookworm}/apache/docker-php-ext-configure (100%) rename 8.2/{buster => bookworm}/apache/docker-php-ext-enable (100%) rename 8.2/{buster => bookworm}/apache/docker-php-ext-install (100%) rename 8.2/{buster => bookworm}/apache/docker-php-source (100%) rename 8.2/{buster => bookworm}/cli/Dockerfile (98%) rename 8.2/{buster => bookworm}/cli/docker-php-entrypoint (100%) rename 8.2/{buster => bookworm}/cli/docker-php-ext-configure (100%) rename 8.2/{buster => bookworm}/cli/docker-php-ext-enable (100%) rename 8.2/{buster => bookworm}/cli/docker-php-ext-install (100%) rename 8.2/{buster => bookworm}/cli/docker-php-source (100%) rename 8.2/{buster => bookworm}/fpm/Dockerfile (98%) rename 8.2/{buster => bookworm}/fpm/docker-php-entrypoint (100%) rename 8.2/{buster => bookworm}/fpm/docker-php-ext-configure (100%) rename 8.2/{buster => bookworm}/fpm/docker-php-ext-enable (100%) rename 8.2/{buster => bookworm}/fpm/docker-php-ext-install (100%) rename 8.2/{buster => bookworm}/fpm/docker-php-source (100%) rename 8.2/{buster => bookworm}/zts/Dockerfile (98%) rename 8.2/{buster => bookworm}/zts/docker-php-entrypoint (100%) rename 8.2/{buster => bookworm}/zts/docker-php-ext-configure (100%) rename 8.2/{buster => bookworm}/zts/docker-php-ext-enable (100%) rename 8.2/{buster => bookworm}/zts/docker-php-ext-install (100%) rename 8.2/{buster => bookworm}/zts/docker-php-source (100%) rename 8.3-rc/{buster => bookworm}/apache/Dockerfile (98%) rename 8.3-rc/{buster => bookworm}/apache/apache2-foreground (100%) rename 8.3-rc/{buster => bookworm}/apache/docker-php-entrypoint (100%) rename 8.3-rc/{buster => bookworm}/apache/docker-php-ext-configure (100%) rename 8.3-rc/{buster => bookworm}/apache/docker-php-ext-enable (100%) rename 8.3-rc/{buster => bookworm}/apache/docker-php-ext-install (100%) rename 8.3-rc/{buster => bookworm}/apache/docker-php-source (100%) rename 8.3-rc/{buster => bookworm}/cli/Dockerfile (98%) rename 8.3-rc/{buster => bookworm}/cli/docker-php-entrypoint (100%) rename 8.3-rc/{buster => bookworm}/cli/docker-php-ext-configure (100%) rename 8.3-rc/{buster => bookworm}/cli/docker-php-ext-enable (100%) rename 8.3-rc/{buster => bookworm}/cli/docker-php-ext-install (100%) rename 8.3-rc/{buster => bookworm}/cli/docker-php-source (100%) rename 8.3-rc/{buster => bookworm}/fpm/Dockerfile (98%) rename 8.3-rc/{buster => bookworm}/fpm/docker-php-entrypoint (100%) rename 8.3-rc/{buster => bookworm}/fpm/docker-php-ext-configure (100%) rename 8.3-rc/{buster => bookworm}/fpm/docker-php-ext-enable (100%) rename 8.3-rc/{buster => bookworm}/fpm/docker-php-ext-install (100%) rename 8.3-rc/{buster => bookworm}/fpm/docker-php-source (100%) rename 8.3-rc/{buster => bookworm}/zts/Dockerfile (98%) rename 8.3-rc/{buster => bookworm}/zts/docker-php-entrypoint (100%) rename 8.3-rc/{buster => bookworm}/zts/docker-php-ext-configure (100%) rename 8.3-rc/{buster => bookworm}/zts/docker-php-ext-enable (100%) rename 8.3-rc/{buster => bookworm}/zts/docker-php-ext-install (100%) rename 8.3-rc/{buster => bookworm}/zts/docker-php-source (100%) diff --git a/8.0/bullseye/apache/Dockerfile b/8.0/bullseye/apache/Dockerfile index f22758a92b..e1e30ba698 100644 --- a/8.0/bullseye/apache/Dockerfile +++ b/8.0/bullseye/apache/Dockerfile @@ -257,7 +257,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.0/bullseye/cli/Dockerfile b/8.0/bullseye/cli/Dockerfile index cb8f903023..f1038c4bd8 100644 --- a/8.0/bullseye/cli/Dockerfile +++ b/8.0/bullseye/cli/Dockerfile @@ -198,7 +198,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.0/bullseye/fpm/Dockerfile b/8.0/bullseye/fpm/Dockerfile index 7d52db1079..9c782afa4c 100644 --- a/8.0/bullseye/fpm/Dockerfile +++ b/8.0/bullseye/fpm/Dockerfile @@ -200,7 +200,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.0/bullseye/zts/Dockerfile b/8.0/bullseye/zts/Dockerfile index 985ceb25f1..041fa92424 100644 --- a/8.0/bullseye/zts/Dockerfile +++ b/8.0/bullseye/zts/Dockerfile @@ -203,7 +203,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile index c5b33033ee..dd19d24796 100644 --- a/8.0/buster/apache/Dockerfile +++ b/8.0/buster/apache/Dockerfile @@ -257,7 +257,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile index 096557b284..52d33c3e2d 100644 --- a/8.0/buster/cli/Dockerfile +++ b/8.0/buster/cli/Dockerfile @@ -198,7 +198,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index aa4d3b9224..fdfdbdc187 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -200,7 +200,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index f5066c84f0..5327bf63d6 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -203,7 +203,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.1/buster/apache/Dockerfile b/8.1/bookworm/apache/Dockerfile similarity index 98% rename from 8.1/buster/apache/Dockerfile rename to 8.1/bookworm/apache/Dockerfile index 4f7e88063a..eee0d5465e 100644 --- a/8.1/buster/apache/Dockerfile +++ b/8.1/bookworm/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -257,7 +257,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.1/buster/apache/apache2-foreground b/8.1/bookworm/apache/apache2-foreground similarity index 100% rename from 8.1/buster/apache/apache2-foreground rename to 8.1/bookworm/apache/apache2-foreground diff --git a/8.1/buster/apache/docker-php-entrypoint b/8.1/bookworm/apache/docker-php-entrypoint similarity index 100% rename from 8.1/buster/apache/docker-php-entrypoint rename to 8.1/bookworm/apache/docker-php-entrypoint diff --git a/8.1/buster/apache/docker-php-ext-configure b/8.1/bookworm/apache/docker-php-ext-configure similarity index 100% rename from 8.1/buster/apache/docker-php-ext-configure rename to 8.1/bookworm/apache/docker-php-ext-configure diff --git a/8.1/buster/apache/docker-php-ext-enable b/8.1/bookworm/apache/docker-php-ext-enable similarity index 100% rename from 8.1/buster/apache/docker-php-ext-enable rename to 8.1/bookworm/apache/docker-php-ext-enable diff --git a/8.1/buster/apache/docker-php-ext-install b/8.1/bookworm/apache/docker-php-ext-install similarity index 100% rename from 8.1/buster/apache/docker-php-ext-install rename to 8.1/bookworm/apache/docker-php-ext-install diff --git a/8.1/buster/apache/docker-php-source b/8.1/bookworm/apache/docker-php-source similarity index 100% rename from 8.1/buster/apache/docker-php-source rename to 8.1/bookworm/apache/docker-php-source diff --git a/8.1/buster/cli/Dockerfile b/8.1/bookworm/cli/Dockerfile similarity index 98% rename from 8.1/buster/cli/Dockerfile rename to 8.1/bookworm/cli/Dockerfile index d767b8bc97..9f95d7cbd7 100644 --- a/8.1/buster/cli/Dockerfile +++ b/8.1/bookworm/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -198,7 +198,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.1/buster/cli/docker-php-entrypoint b/8.1/bookworm/cli/docker-php-entrypoint similarity index 100% rename from 8.1/buster/cli/docker-php-entrypoint rename to 8.1/bookworm/cli/docker-php-entrypoint diff --git a/8.1/buster/cli/docker-php-ext-configure b/8.1/bookworm/cli/docker-php-ext-configure similarity index 100% rename from 8.1/buster/cli/docker-php-ext-configure rename to 8.1/bookworm/cli/docker-php-ext-configure diff --git a/8.1/buster/cli/docker-php-ext-enable b/8.1/bookworm/cli/docker-php-ext-enable similarity index 100% rename from 8.1/buster/cli/docker-php-ext-enable rename to 8.1/bookworm/cli/docker-php-ext-enable diff --git a/8.1/buster/cli/docker-php-ext-install b/8.1/bookworm/cli/docker-php-ext-install similarity index 100% rename from 8.1/buster/cli/docker-php-ext-install rename to 8.1/bookworm/cli/docker-php-ext-install diff --git a/8.1/buster/cli/docker-php-source b/8.1/bookworm/cli/docker-php-source similarity index 100% rename from 8.1/buster/cli/docker-php-source rename to 8.1/bookworm/cli/docker-php-source diff --git a/8.1/buster/fpm/Dockerfile b/8.1/bookworm/fpm/Dockerfile similarity index 98% rename from 8.1/buster/fpm/Dockerfile rename to 8.1/bookworm/fpm/Dockerfile index 45bfb18d30..cffdadef42 100644 --- a/8.1/buster/fpm/Dockerfile +++ b/8.1/bookworm/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -200,7 +200,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.1/buster/fpm/docker-php-entrypoint b/8.1/bookworm/fpm/docker-php-entrypoint similarity index 100% rename from 8.1/buster/fpm/docker-php-entrypoint rename to 8.1/bookworm/fpm/docker-php-entrypoint diff --git a/8.1/buster/fpm/docker-php-ext-configure b/8.1/bookworm/fpm/docker-php-ext-configure similarity index 100% rename from 8.1/buster/fpm/docker-php-ext-configure rename to 8.1/bookworm/fpm/docker-php-ext-configure diff --git a/8.1/buster/fpm/docker-php-ext-enable b/8.1/bookworm/fpm/docker-php-ext-enable similarity index 100% rename from 8.1/buster/fpm/docker-php-ext-enable rename to 8.1/bookworm/fpm/docker-php-ext-enable diff --git a/8.1/buster/fpm/docker-php-ext-install b/8.1/bookworm/fpm/docker-php-ext-install similarity index 100% rename from 8.1/buster/fpm/docker-php-ext-install rename to 8.1/bookworm/fpm/docker-php-ext-install diff --git a/8.1/buster/fpm/docker-php-source b/8.1/bookworm/fpm/docker-php-source similarity index 100% rename from 8.1/buster/fpm/docker-php-source rename to 8.1/bookworm/fpm/docker-php-source diff --git a/8.1/buster/zts/Dockerfile b/8.1/bookworm/zts/Dockerfile similarity index 98% rename from 8.1/buster/zts/Dockerfile rename to 8.1/bookworm/zts/Dockerfile index 1c5162236e..054700e1a7 100644 --- a/8.1/buster/zts/Dockerfile +++ b/8.1/bookworm/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -204,7 +204,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.1/buster/zts/docker-php-entrypoint b/8.1/bookworm/zts/docker-php-entrypoint similarity index 100% rename from 8.1/buster/zts/docker-php-entrypoint rename to 8.1/bookworm/zts/docker-php-entrypoint diff --git a/8.1/buster/zts/docker-php-ext-configure b/8.1/bookworm/zts/docker-php-ext-configure similarity index 100% rename from 8.1/buster/zts/docker-php-ext-configure rename to 8.1/bookworm/zts/docker-php-ext-configure diff --git a/8.1/buster/zts/docker-php-ext-enable b/8.1/bookworm/zts/docker-php-ext-enable similarity index 100% rename from 8.1/buster/zts/docker-php-ext-enable rename to 8.1/bookworm/zts/docker-php-ext-enable diff --git a/8.1/buster/zts/docker-php-ext-install b/8.1/bookworm/zts/docker-php-ext-install similarity index 100% rename from 8.1/buster/zts/docker-php-ext-install rename to 8.1/bookworm/zts/docker-php-ext-install diff --git a/8.1/buster/zts/docker-php-source b/8.1/bookworm/zts/docker-php-source similarity index 100% rename from 8.1/buster/zts/docker-php-source rename to 8.1/bookworm/zts/docker-php-source diff --git a/8.1/bullseye/apache/Dockerfile b/8.1/bullseye/apache/Dockerfile index ba89909b1f..38cab08ee0 100644 --- a/8.1/bullseye/apache/Dockerfile +++ b/8.1/bullseye/apache/Dockerfile @@ -257,7 +257,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.1/bullseye/cli/Dockerfile b/8.1/bullseye/cli/Dockerfile index 33699cc020..01b686e942 100644 --- a/8.1/bullseye/cli/Dockerfile +++ b/8.1/bullseye/cli/Dockerfile @@ -198,7 +198,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.1/bullseye/fpm/Dockerfile b/8.1/bullseye/fpm/Dockerfile index a35873d9fc..b32ad0b55d 100644 --- a/8.1/bullseye/fpm/Dockerfile +++ b/8.1/bullseye/fpm/Dockerfile @@ -200,7 +200,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.1/bullseye/zts/Dockerfile b/8.1/bullseye/zts/Dockerfile index c340b9091f..39496dba7f 100644 --- a/8.1/bullseye/zts/Dockerfile +++ b/8.1/bullseye/zts/Dockerfile @@ -204,7 +204,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.2/buster/apache/Dockerfile b/8.2/bookworm/apache/Dockerfile similarity index 98% rename from 8.2/buster/apache/Dockerfile rename to 8.2/bookworm/apache/Dockerfile index 6e3900216c..abf83be98d 100644 --- a/8.2/buster/apache/Dockerfile +++ b/8.2/bookworm/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -257,7 +257,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.2/buster/apache/apache2-foreground b/8.2/bookworm/apache/apache2-foreground similarity index 100% rename from 8.2/buster/apache/apache2-foreground rename to 8.2/bookworm/apache/apache2-foreground diff --git a/8.2/buster/apache/docker-php-entrypoint b/8.2/bookworm/apache/docker-php-entrypoint similarity index 100% rename from 8.2/buster/apache/docker-php-entrypoint rename to 8.2/bookworm/apache/docker-php-entrypoint diff --git a/8.2/buster/apache/docker-php-ext-configure b/8.2/bookworm/apache/docker-php-ext-configure similarity index 100% rename from 8.2/buster/apache/docker-php-ext-configure rename to 8.2/bookworm/apache/docker-php-ext-configure diff --git a/8.2/buster/apache/docker-php-ext-enable b/8.2/bookworm/apache/docker-php-ext-enable similarity index 100% rename from 8.2/buster/apache/docker-php-ext-enable rename to 8.2/bookworm/apache/docker-php-ext-enable diff --git a/8.2/buster/apache/docker-php-ext-install b/8.2/bookworm/apache/docker-php-ext-install similarity index 100% rename from 8.2/buster/apache/docker-php-ext-install rename to 8.2/bookworm/apache/docker-php-ext-install diff --git a/8.2/buster/apache/docker-php-source b/8.2/bookworm/apache/docker-php-source similarity index 100% rename from 8.2/buster/apache/docker-php-source rename to 8.2/bookworm/apache/docker-php-source diff --git a/8.2/buster/cli/Dockerfile b/8.2/bookworm/cli/Dockerfile similarity index 98% rename from 8.2/buster/cli/Dockerfile rename to 8.2/bookworm/cli/Dockerfile index 13960ea2fa..9a44738cb2 100644 --- a/8.2/buster/cli/Dockerfile +++ b/8.2/bookworm/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -198,7 +198,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.2/buster/cli/docker-php-entrypoint b/8.2/bookworm/cli/docker-php-entrypoint similarity index 100% rename from 8.2/buster/cli/docker-php-entrypoint rename to 8.2/bookworm/cli/docker-php-entrypoint diff --git a/8.2/buster/cli/docker-php-ext-configure b/8.2/bookworm/cli/docker-php-ext-configure similarity index 100% rename from 8.2/buster/cli/docker-php-ext-configure rename to 8.2/bookworm/cli/docker-php-ext-configure diff --git a/8.2/buster/cli/docker-php-ext-enable b/8.2/bookworm/cli/docker-php-ext-enable similarity index 100% rename from 8.2/buster/cli/docker-php-ext-enable rename to 8.2/bookworm/cli/docker-php-ext-enable diff --git a/8.2/buster/cli/docker-php-ext-install b/8.2/bookworm/cli/docker-php-ext-install similarity index 100% rename from 8.2/buster/cli/docker-php-ext-install rename to 8.2/bookworm/cli/docker-php-ext-install diff --git a/8.2/buster/cli/docker-php-source b/8.2/bookworm/cli/docker-php-source similarity index 100% rename from 8.2/buster/cli/docker-php-source rename to 8.2/bookworm/cli/docker-php-source diff --git a/8.2/buster/fpm/Dockerfile b/8.2/bookworm/fpm/Dockerfile similarity index 98% rename from 8.2/buster/fpm/Dockerfile rename to 8.2/bookworm/fpm/Dockerfile index c0d17a748c..7524d77b5a 100644 --- a/8.2/buster/fpm/Dockerfile +++ b/8.2/bookworm/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -200,7 +200,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.2/buster/fpm/docker-php-entrypoint b/8.2/bookworm/fpm/docker-php-entrypoint similarity index 100% rename from 8.2/buster/fpm/docker-php-entrypoint rename to 8.2/bookworm/fpm/docker-php-entrypoint diff --git a/8.2/buster/fpm/docker-php-ext-configure b/8.2/bookworm/fpm/docker-php-ext-configure similarity index 100% rename from 8.2/buster/fpm/docker-php-ext-configure rename to 8.2/bookworm/fpm/docker-php-ext-configure diff --git a/8.2/buster/fpm/docker-php-ext-enable b/8.2/bookworm/fpm/docker-php-ext-enable similarity index 100% rename from 8.2/buster/fpm/docker-php-ext-enable rename to 8.2/bookworm/fpm/docker-php-ext-enable diff --git a/8.2/buster/fpm/docker-php-ext-install b/8.2/bookworm/fpm/docker-php-ext-install similarity index 100% rename from 8.2/buster/fpm/docker-php-ext-install rename to 8.2/bookworm/fpm/docker-php-ext-install diff --git a/8.2/buster/fpm/docker-php-source b/8.2/bookworm/fpm/docker-php-source similarity index 100% rename from 8.2/buster/fpm/docker-php-source rename to 8.2/bookworm/fpm/docker-php-source diff --git a/8.2/buster/zts/Dockerfile b/8.2/bookworm/zts/Dockerfile similarity index 98% rename from 8.2/buster/zts/Dockerfile rename to 8.2/bookworm/zts/Dockerfile index 8d2d44d932..ecfc92fb3a 100644 --- a/8.2/buster/zts/Dockerfile +++ b/8.2/bookworm/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -204,7 +204,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.2/buster/zts/docker-php-entrypoint b/8.2/bookworm/zts/docker-php-entrypoint similarity index 100% rename from 8.2/buster/zts/docker-php-entrypoint rename to 8.2/bookworm/zts/docker-php-entrypoint diff --git a/8.2/buster/zts/docker-php-ext-configure b/8.2/bookworm/zts/docker-php-ext-configure similarity index 100% rename from 8.2/buster/zts/docker-php-ext-configure rename to 8.2/bookworm/zts/docker-php-ext-configure diff --git a/8.2/buster/zts/docker-php-ext-enable b/8.2/bookworm/zts/docker-php-ext-enable similarity index 100% rename from 8.2/buster/zts/docker-php-ext-enable rename to 8.2/bookworm/zts/docker-php-ext-enable diff --git a/8.2/buster/zts/docker-php-ext-install b/8.2/bookworm/zts/docker-php-ext-install similarity index 100% rename from 8.2/buster/zts/docker-php-ext-install rename to 8.2/bookworm/zts/docker-php-ext-install diff --git a/8.2/buster/zts/docker-php-source b/8.2/bookworm/zts/docker-php-source similarity index 100% rename from 8.2/buster/zts/docker-php-source rename to 8.2/bookworm/zts/docker-php-source diff --git a/8.2/bullseye/apache/Dockerfile b/8.2/bullseye/apache/Dockerfile index c44dfb249e..b5fcf0b855 100644 --- a/8.2/bullseye/apache/Dockerfile +++ b/8.2/bullseye/apache/Dockerfile @@ -257,7 +257,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.2/bullseye/cli/Dockerfile b/8.2/bullseye/cli/Dockerfile index 86a7209241..8fcc1fd32f 100644 --- a/8.2/bullseye/cli/Dockerfile +++ b/8.2/bullseye/cli/Dockerfile @@ -198,7 +198,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile index 1c78f724f1..383936c6c6 100644 --- a/8.2/bullseye/fpm/Dockerfile +++ b/8.2/bullseye/fpm/Dockerfile @@ -200,7 +200,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.2/bullseye/zts/Dockerfile b/8.2/bullseye/zts/Dockerfile index ff3455f4d7..99d156778c 100644 --- a/8.2/bullseye/zts/Dockerfile +++ b/8.2/bullseye/zts/Dockerfile @@ -204,7 +204,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.3-rc/buster/apache/Dockerfile b/8.3-rc/bookworm/apache/Dockerfile similarity index 98% rename from 8.3-rc/buster/apache/Dockerfile rename to 8.3-rc/bookworm/apache/Dockerfile index db62a3232a..1e5c1993ac 100644 --- a/8.3-rc/buster/apache/Dockerfile +++ b/8.3-rc/bookworm/apache/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -257,7 +257,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.3-rc/buster/apache/apache2-foreground b/8.3-rc/bookworm/apache/apache2-foreground similarity index 100% rename from 8.3-rc/buster/apache/apache2-foreground rename to 8.3-rc/bookworm/apache/apache2-foreground diff --git a/8.3-rc/buster/apache/docker-php-entrypoint b/8.3-rc/bookworm/apache/docker-php-entrypoint similarity index 100% rename from 8.3-rc/buster/apache/docker-php-entrypoint rename to 8.3-rc/bookworm/apache/docker-php-entrypoint diff --git a/8.3-rc/buster/apache/docker-php-ext-configure b/8.3-rc/bookworm/apache/docker-php-ext-configure similarity index 100% rename from 8.3-rc/buster/apache/docker-php-ext-configure rename to 8.3-rc/bookworm/apache/docker-php-ext-configure diff --git a/8.3-rc/buster/apache/docker-php-ext-enable b/8.3-rc/bookworm/apache/docker-php-ext-enable similarity index 100% rename from 8.3-rc/buster/apache/docker-php-ext-enable rename to 8.3-rc/bookworm/apache/docker-php-ext-enable diff --git a/8.3-rc/buster/apache/docker-php-ext-install b/8.3-rc/bookworm/apache/docker-php-ext-install similarity index 100% rename from 8.3-rc/buster/apache/docker-php-ext-install rename to 8.3-rc/bookworm/apache/docker-php-ext-install diff --git a/8.3-rc/buster/apache/docker-php-source b/8.3-rc/bookworm/apache/docker-php-source similarity index 100% rename from 8.3-rc/buster/apache/docker-php-source rename to 8.3-rc/bookworm/apache/docker-php-source diff --git a/8.3-rc/buster/cli/Dockerfile b/8.3-rc/bookworm/cli/Dockerfile similarity index 98% rename from 8.3-rc/buster/cli/Dockerfile rename to 8.3-rc/bookworm/cli/Dockerfile index 87cd35dbcc..f80607cb22 100644 --- a/8.3-rc/buster/cli/Dockerfile +++ b/8.3-rc/bookworm/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -198,7 +198,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.3-rc/buster/cli/docker-php-entrypoint b/8.3-rc/bookworm/cli/docker-php-entrypoint similarity index 100% rename from 8.3-rc/buster/cli/docker-php-entrypoint rename to 8.3-rc/bookworm/cli/docker-php-entrypoint diff --git a/8.3-rc/buster/cli/docker-php-ext-configure b/8.3-rc/bookworm/cli/docker-php-ext-configure similarity index 100% rename from 8.3-rc/buster/cli/docker-php-ext-configure rename to 8.3-rc/bookworm/cli/docker-php-ext-configure diff --git a/8.3-rc/buster/cli/docker-php-ext-enable b/8.3-rc/bookworm/cli/docker-php-ext-enable similarity index 100% rename from 8.3-rc/buster/cli/docker-php-ext-enable rename to 8.3-rc/bookworm/cli/docker-php-ext-enable diff --git a/8.3-rc/buster/cli/docker-php-ext-install b/8.3-rc/bookworm/cli/docker-php-ext-install similarity index 100% rename from 8.3-rc/buster/cli/docker-php-ext-install rename to 8.3-rc/bookworm/cli/docker-php-ext-install diff --git a/8.3-rc/buster/cli/docker-php-source b/8.3-rc/bookworm/cli/docker-php-source similarity index 100% rename from 8.3-rc/buster/cli/docker-php-source rename to 8.3-rc/bookworm/cli/docker-php-source diff --git a/8.3-rc/buster/fpm/Dockerfile b/8.3-rc/bookworm/fpm/Dockerfile similarity index 98% rename from 8.3-rc/buster/fpm/Dockerfile rename to 8.3-rc/bookworm/fpm/Dockerfile index 3c040c2c3a..78b139a637 100644 --- a/8.3-rc/buster/fpm/Dockerfile +++ b/8.3-rc/bookworm/fpm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -200,7 +200,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.3-rc/buster/fpm/docker-php-entrypoint b/8.3-rc/bookworm/fpm/docker-php-entrypoint similarity index 100% rename from 8.3-rc/buster/fpm/docker-php-entrypoint rename to 8.3-rc/bookworm/fpm/docker-php-entrypoint diff --git a/8.3-rc/buster/fpm/docker-php-ext-configure b/8.3-rc/bookworm/fpm/docker-php-ext-configure similarity index 100% rename from 8.3-rc/buster/fpm/docker-php-ext-configure rename to 8.3-rc/bookworm/fpm/docker-php-ext-configure diff --git a/8.3-rc/buster/fpm/docker-php-ext-enable b/8.3-rc/bookworm/fpm/docker-php-ext-enable similarity index 100% rename from 8.3-rc/buster/fpm/docker-php-ext-enable rename to 8.3-rc/bookworm/fpm/docker-php-ext-enable diff --git a/8.3-rc/buster/fpm/docker-php-ext-install b/8.3-rc/bookworm/fpm/docker-php-ext-install similarity index 100% rename from 8.3-rc/buster/fpm/docker-php-ext-install rename to 8.3-rc/bookworm/fpm/docker-php-ext-install diff --git a/8.3-rc/buster/fpm/docker-php-source b/8.3-rc/bookworm/fpm/docker-php-source similarity index 100% rename from 8.3-rc/buster/fpm/docker-php-source rename to 8.3-rc/bookworm/fpm/docker-php-source diff --git a/8.3-rc/buster/zts/Dockerfile b/8.3-rc/bookworm/zts/Dockerfile similarity index 98% rename from 8.3-rc/buster/zts/Dockerfile rename to 8.3-rc/bookworm/zts/Dockerfile index b9bd41dd53..fcd0de1590 100644 --- a/8.3-rc/buster/zts/Dockerfile +++ b/8.3-rc/bookworm/zts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim # prevent Debian's PHP packages from being installed # https://github.com/docker-library/php/pull/542 @@ -203,7 +203,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.3-rc/buster/zts/docker-php-entrypoint b/8.3-rc/bookworm/zts/docker-php-entrypoint similarity index 100% rename from 8.3-rc/buster/zts/docker-php-entrypoint rename to 8.3-rc/bookworm/zts/docker-php-entrypoint diff --git a/8.3-rc/buster/zts/docker-php-ext-configure b/8.3-rc/bookworm/zts/docker-php-ext-configure similarity index 100% rename from 8.3-rc/buster/zts/docker-php-ext-configure rename to 8.3-rc/bookworm/zts/docker-php-ext-configure diff --git a/8.3-rc/buster/zts/docker-php-ext-enable b/8.3-rc/bookworm/zts/docker-php-ext-enable similarity index 100% rename from 8.3-rc/buster/zts/docker-php-ext-enable rename to 8.3-rc/bookworm/zts/docker-php-ext-enable diff --git a/8.3-rc/buster/zts/docker-php-ext-install b/8.3-rc/bookworm/zts/docker-php-ext-install similarity index 100% rename from 8.3-rc/buster/zts/docker-php-ext-install rename to 8.3-rc/bookworm/zts/docker-php-ext-install diff --git a/8.3-rc/buster/zts/docker-php-source b/8.3-rc/bookworm/zts/docker-php-source similarity index 100% rename from 8.3-rc/buster/zts/docker-php-source rename to 8.3-rc/bookworm/zts/docker-php-source diff --git a/8.3-rc/bullseye/apache/Dockerfile b/8.3-rc/bullseye/apache/Dockerfile index caea0b5b0b..2a5c875b7c 100644 --- a/8.3-rc/bullseye/apache/Dockerfile +++ b/8.3-rc/bullseye/apache/Dockerfile @@ -257,7 +257,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.3-rc/bullseye/cli/Dockerfile b/8.3-rc/bullseye/cli/Dockerfile index c16f2fb028..631d311919 100644 --- a/8.3-rc/bullseye/cli/Dockerfile +++ b/8.3-rc/bullseye/cli/Dockerfile @@ -198,7 +198,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.3-rc/bullseye/fpm/Dockerfile b/8.3-rc/bullseye/fpm/Dockerfile index fbf2291c99..320f6e8efd 100644 --- a/8.3-rc/bullseye/fpm/Dockerfile +++ b/8.3-rc/bullseye/fpm/Dockerfile @@ -200,7 +200,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/8.3-rc/bullseye/zts/Dockerfile b/8.3-rc/bullseye/zts/Dockerfile index 4ca70ce7e7..a88fec577f 100644 --- a/8.3-rc/bullseye/zts/Dockerfile +++ b/8.3-rc/bullseye/zts/Dockerfile @@ -203,7 +203,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index f532e19501..b6b61f9b6a 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -422,7 +422,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/versions.json b/versions.json index 38e788edfc..3004ca883d 100644 --- a/versions.json +++ b/versions.json @@ -24,14 +24,14 @@ "sha256": "4c9973f599e93ed5e8ce2b45ce1d41bb8fb54ce642824fd23e56b52fd75029a6", "url": "https://www.php.net/distributions/php-8.1.20.tar.xz", "variants": [ + "bookworm/cli", + "bookworm/apache", + "bookworm/fpm", + "bookworm/zts", "bullseye/cli", "bullseye/apache", "bullseye/fpm", "bullseye/zts", - "buster/cli", - "buster/apache", - "buster/fpm", - "buster/zts", "alpine3.18/cli", "alpine3.18/fpm", "alpine3.18/zts", @@ -50,14 +50,14 @@ "sha256": "4b9fb3dcd7184fe7582d7e44544ec7c5153852a2528de3b6754791258ffbdfa0", "url": "https://www.php.net/distributions/php-8.2.7.tar.xz", "variants": [ + "bookworm/cli", + "bookworm/apache", + "bookworm/fpm", + "bookworm/zts", "bullseye/cli", "bullseye/apache", "bullseye/fpm", "bullseye/zts", - "buster/cli", - "buster/apache", - "buster/fpm", - "buster/zts", "alpine3.18/cli", "alpine3.18/fpm", "alpine3.18/zts", @@ -73,14 +73,14 @@ "sha256": "7df01cbae615cccdc01a811094a74326119080e1141988fd57aeefd6b751165c", "url": "https://downloads.php.net/~jakub/php-8.3.0alpha1.tar.xz", "variants": [ + "bookworm/cli", + "bookworm/apache", + "bookworm/fpm", + "bookworm/zts", "bullseye/cli", "bullseye/apache", "bullseye/fpm", "bullseye/zts", - "buster/cli", - "buster/apache", - "buster/fpm", - "buster/zts", "alpine3.18/cli", "alpine3.18/fpm", "alpine3.18/zts", diff --git a/versions.sh b/versions.sh index a0c239832b..d85cd99103 100755 --- a/versions.sh +++ b/versions.sh @@ -85,6 +85,7 @@ for version in "${versions[@]}"; do variants='[]' # order here controls the order of the library/ file for suite in \ + bookworm \ bullseye \ buster \ alpine3.18 \ @@ -95,6 +96,13 @@ for version in "${versions[@]}"; do if [ "$rcVersion" = '8.0' ] && [[ "$suite" = alpine* ]] && [ "$suite" != 'alpine3.16' ]; then continue fi + # 8.0 doesn't support OpenSSL 3, which is the only version in bookworm + # only keep two variants of Debian per version of php + if [ "$rcVersion" = '8.0' ] && [ "$suite" = 'bookworm' ]; then + continue + elif [ "$rcVersion" != '8.0' ] && [ "$suite" = 'buster' ]; then + continue + fi # https://github.com/docker-library/php/pull/1405 # 8.1 is temporary: https://github.com/docker-library/official-images/pull/14735 (should remove Alpine 3.16 support once Nextcloud 25 is EOL ~Oct 2023) if [ "$suite" = 'alpine3.16' ] && [ "$rcVersion" != '8.0' ] && [ "$rcVersion" != '8.1' ]; then