From 4a6e70cdb3288df1bc221d9064a96ffb6ca24437 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Mon, 28 Jul 2025 20:49:21 +0000 Subject: [PATCH 1/5] Runs update.sh --- 30/apache/Dockerfile | 2 +- 30/fpm-alpine/Dockerfile | 2 +- 30/fpm/Dockerfile | 2 +- 31/apache/Dockerfile | 2 +- 31/fpm-alpine/Dockerfile | 2 +- 31/fpm/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index 4dd63de1..9023f4b8 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -66,7 +66,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.24; \ + pecl install APCu-5.1.25; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index 01240a0e..2064ab18 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.24; \ + pecl install APCu-5.1.25; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index 0f5bd55d..5a496997 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -66,7 +66,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.24; \ + pecl install APCu-5.1.25; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile index fff4647e..24d90d1b 100644 --- a/31/apache/Dockerfile +++ b/31/apache/Dockerfile @@ -66,7 +66,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.24; \ + pecl install APCu-5.1.25; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile index e4486ff9..cf0c14e2 100644 --- a/31/fpm-alpine/Dockerfile +++ b/31/fpm-alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.24; \ + pecl install APCu-5.1.25; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile index c83e2e17..78d9715b 100644 --- a/31/fpm/Dockerfile +++ b/31/fpm/Dockerfile @@ -66,7 +66,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.24; \ + pecl install APCu-5.1.25; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ From b326158abcd68cbd7574f44e886c529cb19f536e Mon Sep 17 00:00:00 2001 From: SebastianRzk <5215946+SebastianRzk@users.noreply.github.com> Date: Mon, 28 Jul 2025 22:56:54 +0200 Subject: [PATCH 2/5] add dynamic re-resolve feature of nginx (#2413) Signed-off-by: SebastianRzk Co-authored-by: SebastianRzk --- .examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf | 4 +++- .examples/docker-compose/insecure/postgres/fpm/web/nginx.conf | 4 +++- .../with-nginx-proxy/mariadb/fpm/web/nginx.conf | 4 +++- .../with-nginx-proxy/postgres/fpm/web/nginx.conf | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf index 6e0ad588..cb1d4fff 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf @@ -39,8 +39,10 @@ http { #gzip on; + resolver 127.0.0.11 valid=2s; upstream php-handler { - server app:9000; + zone backends 64k; + server app:9000 resolve; } server { diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf index 6e0ad588..cb1d4fff 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf @@ -39,8 +39,10 @@ http { #gzip on; + resolver 127.0.0.11 valid=2s; upstream php-handler { - server app:9000; + zone backends 64k; + server app:9000 resolve; } server { diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf index a0db1a1c..ad2749cd 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf @@ -39,8 +39,10 @@ http { #gzip on; + resolver 127.0.0.11 valid=2s; upstream php-handler { - server app:9000; + zone backends 64k; + server app:9000 resolve; } server { diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf index a0db1a1c..ad2749cd 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf @@ -39,8 +39,10 @@ http { #gzip on; + resolver 127.0.0.11 valid=2s; upstream php-handler { - server app:9000; + zone backends 64k; + server app:9000 resolve; } server { From 6e4ccffb9a2ea802e6522481a1f61602fc3f5a5d Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Wed, 6 Aug 2025 00:42:16 +0000 Subject: [PATCH 3/5] Runs update.sh --- 30/apache/Dockerfile | 2 +- 30/fpm-alpine/Dockerfile | 2 +- 30/fpm/Dockerfile | 2 +- 31/apache/Dockerfile | 2 +- 31/fpm-alpine/Dockerfile | 2 +- 31/fpm/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index 9023f4b8..d732de27 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -66,7 +66,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.25; \ + pecl install APCu-5.1.26; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index 2064ab18..5a6c4e82 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.25; \ + pecl install APCu-5.1.26; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index 5a496997..c4177d77 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -66,7 +66,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.25; \ + pecl install APCu-5.1.26; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile index 24d90d1b..cbcd2245 100644 --- a/31/apache/Dockerfile +++ b/31/apache/Dockerfile @@ -66,7 +66,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.25; \ + pecl install APCu-5.1.26; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile index cf0c14e2..4ceef728 100644 --- a/31/fpm-alpine/Dockerfile +++ b/31/fpm-alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.25; \ + pecl install APCu-5.1.26; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile index 78d9715b..9cfa46dc 100644 --- a/31/fpm/Dockerfile +++ b/31/fpm/Dockerfile @@ -66,7 +66,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.25; \ + pecl install APCu-5.1.26; \ pecl install igbinary-3.2.16; \ pecl install imagick-3.8.0; \ pecl install memcached-3.3.0 \ From 9a78a3478ea07190394c469c87ab85c73337ccba Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Thu, 14 Aug 2025 18:54:14 +0000 Subject: [PATCH 4/5] Runs update.sh --- 30/apache/Dockerfile | 6 +++--- 30/fpm-alpine/Dockerfile | 6 +++--- 30/fpm/Dockerfile | 6 +++--- 31/apache/Dockerfile | 6 +++--- 31/fpm-alpine/Dockerfile | 6 +++--- 31/fpm/Dockerfile | 6 +++--- latest.txt | 2 +- versions.json | 12 ++++++------ 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index d732de27..110f6fe9 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -150,7 +150,7 @@ RUN { \ } > /etc/apache2/conf-available/apache-limits.conf; \ a2enconf apache-limits -ENV NEXTCLOUD_VERSION 30.0.13 +ENV NEXTCLOUD_VERSION 30.0.14 RUN set -ex; \ fetchDeps=" \ @@ -160,8 +160,8 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends $fetchDeps; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index 5a6c4e82..6c2c4371 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -130,7 +130,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 30.0.13 +ENV NEXTCLOUD_VERSION 30.0.14 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ @@ -138,8 +138,8 @@ RUN set -ex; \ gnupg \ ; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index c4177d77..8443a588 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -135,7 +135,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 30.0.13 +ENV NEXTCLOUD_VERSION 30.0.14 RUN set -ex; \ fetchDeps=" \ @@ -145,8 +145,8 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends $fetchDeps; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile index cbcd2245..f4af7ff2 100644 --- a/31/apache/Dockerfile +++ b/31/apache/Dockerfile @@ -150,7 +150,7 @@ RUN { \ } > /etc/apache2/conf-available/apache-limits.conf; \ a2enconf apache-limits -ENV NEXTCLOUD_VERSION 31.0.7 +ENV NEXTCLOUD_VERSION 31.0.8 RUN set -ex; \ fetchDeps=" \ @@ -160,8 +160,8 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends $fetchDeps; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile index 4ceef728..3b645db2 100644 --- a/31/fpm-alpine/Dockerfile +++ b/31/fpm-alpine/Dockerfile @@ -130,7 +130,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 31.0.7 +ENV NEXTCLOUD_VERSION 31.0.8 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ @@ -138,8 +138,8 @@ RUN set -ex; \ gnupg \ ; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile index 9cfa46dc..26af48df 100644 --- a/31/fpm/Dockerfile +++ b/31/fpm/Dockerfile @@ -135,7 +135,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 31.0.7 +ENV NEXTCLOUD_VERSION 31.0.8 RUN set -ex; \ fetchDeps=" \ @@ -145,8 +145,8 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends $fetchDeps; \ \ - curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2"; \ - curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2.asc"; \ + curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg key from https://nextcloud.com/nextcloud.asc gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \ diff --git a/latest.txt b/latest.txt index b9f889c4..121a4e3d 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -31.0.7 +31.0.8 diff --git a/versions.json b/versions.json index 12cb183a..b35a9900 100644 --- a/versions.json +++ b/versions.json @@ -1,9 +1,9 @@ { "31": { "branch": "31", - "version": "31.0.7", - "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2", - "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2.asc", + "version": "31.0.8", + "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2", + "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.8.tar.bz2.asc", "variants": { "apache": { "variant": "apache", @@ -27,9 +27,9 @@ }, "30": { "branch": "30", - "version": "30.0.13", - "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2", - "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2.asc", + "version": "30.0.14", + "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2", + "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.14.tar.bz2.asc", "variants": { "apache": { "variant": "apache", From 943e55d314b4540c322fc9ac42e04dbda8ac01c1 Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 14 Aug 2025 19:55:08 +0000 Subject: [PATCH 5/5] Debian Trixie (#2454) Signed-off-by: J0WI --- 30/apache/Dockerfile | 16 ++++++++-------- 30/fpm-alpine/Dockerfile | 1 - 30/fpm/Dockerfile | 16 ++++++++-------- 31/apache/Dockerfile | 16 ++++++++-------- 31/fpm-alpine/Dockerfile | 1 - 31/fpm/Dockerfile | 16 ++++++++-------- Dockerfile-alpine.template | 1 - Dockerfile-debian.template | 14 +++++++------- update.sh | 2 +- versions.json | 8 ++++---- 10 files changed, 44 insertions(+), 47 deletions(-) diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index 110f6fe9..845e1e75 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.3-apache-bookworm +FROM php:8.3-apache-trixie # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -9,10 +9,10 @@ RUN set -ex; \ busybox-static \ bzip2 \ libldap-common \ - libmagickcore-6.q16-6-extra \ + libmagickcore-7.q16-10-extra \ rsync \ ; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /var/spool/cron/crontabs; \ echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data @@ -57,7 +57,6 @@ RUN set -ex; \ gmp \ intl \ ldap \ - opcache \ pcntl \ pdo_mysql \ pdo_pgsql \ @@ -89,13 +88,14 @@ RUN set -ex; \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ | 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 \ + | 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 -rt apt-mark manual; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # set recommended PHP.ini settings # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache @@ -175,7 +175,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean COPY *.sh upgrade.exclude / COPY config/* /usr/src/nextcloud/config/ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index 6c2c4371..53dba22b 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -54,7 +54,6 @@ RUN set -ex; \ gmp \ intl \ ldap \ - opcache \ pcntl \ pdo_mysql \ pdo_pgsql \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index 8443a588..0a66b4e6 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.3-fpm-bookworm +FROM php:8.3-fpm-trixie # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -9,10 +9,10 @@ RUN set -ex; \ busybox-static \ bzip2 \ libldap-common \ - libmagickcore-6.q16-6-extra \ + libmagickcore-7.q16-10-extra \ rsync \ ; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /var/spool/cron/crontabs; \ echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data @@ -57,7 +57,6 @@ RUN set -ex; \ gmp \ intl \ ldap \ - opcache \ pcntl \ pdo_mysql \ pdo_pgsql \ @@ -89,13 +88,14 @@ RUN set -ex; \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ | 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 \ + | 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 -rt apt-mark manual; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # set recommended PHP.ini settings # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache @@ -160,7 +160,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean COPY *.sh upgrade.exclude / COPY config/* /usr/src/nextcloud/config/ diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile index f4af7ff2..f559d096 100644 --- a/31/apache/Dockerfile +++ b/31/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.3-apache-bookworm +FROM php:8.3-apache-trixie # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -9,10 +9,10 @@ RUN set -ex; \ busybox-static \ bzip2 \ libldap-common \ - libmagickcore-6.q16-6-extra \ + libmagickcore-7.q16-10-extra \ rsync \ ; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /var/spool/cron/crontabs; \ echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data @@ -57,7 +57,6 @@ RUN set -ex; \ gmp \ intl \ ldap \ - opcache \ pcntl \ pdo_mysql \ pdo_pgsql \ @@ -89,13 +88,14 @@ RUN set -ex; \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ | 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 \ + | 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 -rt apt-mark manual; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # set recommended PHP.ini settings # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache @@ -175,7 +175,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean COPY *.sh upgrade.exclude / COPY config/* /usr/src/nextcloud/config/ diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile index 3b645db2..19b04260 100644 --- a/31/fpm-alpine/Dockerfile +++ b/31/fpm-alpine/Dockerfile @@ -54,7 +54,6 @@ RUN set -ex; \ gmp \ intl \ ldap \ - opcache \ pcntl \ pdo_mysql \ pdo_pgsql \ diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile index 26af48df..78610bef 100644 --- a/31/fpm/Dockerfile +++ b/31/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.3-fpm-bookworm +FROM php:8.3-fpm-trixie # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -9,10 +9,10 @@ RUN set -ex; \ busybox-static \ bzip2 \ libldap-common \ - libmagickcore-6.q16-6-extra \ + libmagickcore-7.q16-10-extra \ rsync \ ; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /var/spool/cron/crontabs; \ echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data @@ -57,7 +57,6 @@ RUN set -ex; \ gmp \ intl \ ldap \ - opcache \ pcntl \ pdo_mysql \ pdo_pgsql \ @@ -89,13 +88,14 @@ RUN set -ex; \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ | 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 \ + | 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 -rt apt-mark manual; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # set recommended PHP.ini settings # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache @@ -160,7 +160,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean COPY *.sh upgrade.exclude / COPY config/* /usr/src/nextcloud/config/ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index cf6af0ff..60a82315 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -53,7 +53,6 @@ RUN set -ex; \ gmp \ intl \ ldap \ - opcache \ pcntl \ pdo_mysql \ pdo_pgsql \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index cadae18a..cbbc7a0e 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -8,10 +8,10 @@ RUN set -ex; \ busybox-static \ bzip2 \ libldap-common \ - libmagickcore-6.q16-6-extra \ + libmagickcore-7.q16-10-extra \ rsync \ ; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ mkdir -p /var/spool/cron/crontabs; \ echo '*/%%CRONTAB_INT%% * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data @@ -56,7 +56,6 @@ RUN set -ex; \ gmp \ intl \ ldap \ - opcache \ pcntl \ pdo_mysql \ pdo_pgsql \ @@ -88,13 +87,14 @@ RUN set -ex; \ ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ | 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 \ + | 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 -rt apt-mark manual; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # set recommended PHP.ini settings # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache @@ -159,7 +159,7 @@ RUN set -ex; \ chmod +x /usr/src/nextcloud/occ; \ \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean COPY *.sh upgrade.exclude / COPY config/* /usr/src/nextcloud/config/ diff --git a/update.sh b/update.sh index c7e4a2d4..c1d8478e 100755 --- a/update.sh +++ b/update.sh @@ -6,7 +6,7 @@ declare -A alpine_version=( ) declare -A debian_version=( - [default]='bookworm' + [default]='trixie' ) declare -A php_version=( diff --git a/versions.json b/versions.json index b35a9900..f068d07a 100644 --- a/versions.json +++ b/versions.json @@ -8,13 +8,13 @@ "apache": { "variant": "apache", "base": "debian", - "baseVersion": "bookworm", + "baseVersion": "trixie", "phpVersion": "8.3" }, "fpm": { "variant": "fpm", "base": "debian", - "baseVersion": "bookworm", + "baseVersion": "trixie", "phpVersion": "8.3" }, "fpm-alpine": { @@ -34,13 +34,13 @@ "apache": { "variant": "apache", "base": "debian", - "baseVersion": "bookworm", + "baseVersion": "trixie", "phpVersion": "8.3" }, "fpm": { "variant": "fpm", "base": "debian", - "baseVersion": "bookworm", + "baseVersion": "trixie", "phpVersion": "8.3" }, "fpm-alpine": {