Runs update.sh

7 files changed, 20 insertions, 20 deletions

diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile
index 1f2eca65..8430f623 100644
--- a/25/apache/Dockerfile
+++ b/25/apache/Dockerfile
@@ -79,9 +79,9 @@ RUN set -ex; \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
+        | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile
index f3889f1c..c3d29e1d 100644
--- a/25/fpm/Dockerfile
+++ b/25/fpm/Dockerfile
@@ -79,9 +79,9 @@ RUN set -ex; \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
+        | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
diff --git a/26/apache/Dockerfile b/26/apache/Dockerfile
index c93c55f9..e8d40ccc 100644
--- a/26/apache/Dockerfile
+++ b/26/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-apache-bullseye
+FROM php:8.2-apache-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -80,9 +80,9 @@ RUN set -ex; \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
+        | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
diff --git a/26/fpm/Dockerfile b/26/fpm/Dockerfile
index 86eba0fe..a0d54638 100644
--- a/26/fpm/Dockerfile
+++ b/26/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-fpm-bullseye
+FROM php:8.2-fpm-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -80,9 +80,9 @@ RUN set -ex; \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
+        | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
diff --git a/27/apache/Dockerfile b/27/apache/Dockerfile
index 9d3b3e01..f43c5754 100644
--- a/27/apache/Dockerfile
+++ b/27/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-apache-bullseye
+FROM php:8.2-apache-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -80,9 +80,9 @@ RUN set -ex; \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
+        | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
diff --git a/27/fpm/Dockerfile b/27/fpm/Dockerfile
index 4ed428de..dcb53cf1 100644
--- a/27/fpm/Dockerfile
+++ b/27/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-fpm-bullseye
+FROM php:8.2-fpm-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -80,9 +80,9 @@ RUN set -ex; \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
     ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
+        | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
         | sort -u \
-        | xargs -r dpkg-query -S \
+        | xargs -r dpkg-query --search \
         | cut -d: -f1 \
         | sort -u \
         | xargs -rt apt-mark manual; \
diff --git a/versions.json b/versions.json
index 3dccf4d0..64097540 100644
--- a/versions.json
+++ b/versions.json
@@ -8,13 +8,13 @@
       "apache": {
         "variant": "apache",
         "base": "debian",
-        "baseVersion": "bullseye",
+        "baseVersion": "bookworm",
         "phpVersion": "8.2"
       },
       "fpm": {
         "variant": "fpm",
         "base": "debian",
-        "baseVersion": "bullseye",
+        "baseVersion": "bookworm",
         "phpVersion": "8.2"
       },
       "fpm-alpine": {
@@ -34,13 +34,13 @@
       "apache": {
         "variant": "apache",
         "base": "debian",
-        "baseVersion": "bullseye",
+        "baseVersion": "bookworm",
         "phpVersion": "8.2"
       },
       "fpm": {
         "variant": "fpm",
         "base": "debian",
-        "baseVersion": "bullseye",
+        "baseVersion": "bookworm",
         "phpVersion": "8.2"
       },
       "fpm-alpine": {