diff options
author | GitHub Workflow <workflow@github.com> | 2023-07-24 19:36:18 +0000 |
---|---|---|
committer | GitHub Workflow <workflow@github.com> | 2023-07-24 19:36:18 +0000 |
commit | f0f6fc1f030d50dcba35404a0bff74d92f8cb155 (patch) | |
tree | 366383375469eb78fc01966f9297321cdb47b916 /27 | |
parent | d3b3eeba85fb3efd0e939314a3019fc864812351 (diff) |
Runs update.sh
Diffstat (limited to '27')
-rw-r--r-- | 27/apache/Dockerfile | 6 | ||||
-rw-r--r-- | 27/fpm/Dockerfile | 6 |
2 files changed, 6 insertions, 6 deletions
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; \ |