Skip to content

Conversation

@J0WI
Copy link
Contributor

@J0WI J0WI commented Aug 14, 2025

No description provided.

@J0WI J0WI requested a review from a team as a code owner August 14, 2025 20:20
@github-actions
Copy link

Diff for 5f946d2:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 3616e93..a37aa8b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -4,7 +4,6 @@ arm32v6
 arm32v7
 arm64v8
 i386
-mips64le
 ppc64le
 riscv64
 s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index d96584a..6a5dbd9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,32 +1,32 @@
 Maintainers: Nextcloud <[email protected]> (@nextcloud)
 GitRepo: https://github.com/nextcloud/docker.git
 
-Tags: 30.0.13-apache, 30.0-apache, 30-apache, 30.0.13, 30.0, 30
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6e4ccffb9a2ea802e6522481a1f61602fc3f5a5d
+Tags: 30.0.14-apache, 30.0-apache, 30-apache, 30.0.14, 30.0, 30
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 943e55d314b4540c322fc9ac42e04dbda8ac01c1
 Directory: 30/apache
 
-Tags: 30.0.13-fpm, 30.0-fpm, 30-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6e4ccffb9a2ea802e6522481a1f61602fc3f5a5d
+Tags: 30.0.14-fpm, 30.0-fpm, 30-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 943e55d314b4540c322fc9ac42e04dbda8ac01c1
 Directory: 30/fpm
 
-Tags: 30.0.13-fpm-alpine, 30.0-fpm-alpine, 30-fpm-alpine
+Tags: 30.0.14-fpm-alpine, 30.0-fpm-alpine, 30-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 6e4ccffb9a2ea802e6522481a1f61602fc3f5a5d
+GitCommit: 943e55d314b4540c322fc9ac42e04dbda8ac01c1
 Directory: 30/fpm-alpine
 
-Tags: 31.0.7-apache, 31.0-apache, 31-apache, apache, stable-apache, production-apache, 31.0.7, 31.0, 31, latest, stable, production
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6e4ccffb9a2ea802e6522481a1f61602fc3f5a5d
+Tags: 31.0.8-apache, 31.0-apache, 31-apache, apache, 31.0.8, 31.0, 31, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 943e55d314b4540c322fc9ac42e04dbda8ac01c1
 Directory: 31/apache
 
-Tags: 31.0.7-fpm, 31.0-fpm, 31-fpm, fpm, stable-fpm, production-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6e4ccffb9a2ea802e6522481a1f61602fc3f5a5d
+Tags: 31.0.8-fpm, 31.0-fpm, 31-fpm, fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 943e55d314b4540c322fc9ac42e04dbda8ac01c1
 Directory: 31/fpm
 
-Tags: 31.0.7-fpm-alpine, 31.0-fpm-alpine, 31-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 31.0.8-fpm-alpine, 31.0-fpm-alpine, 31-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 6e4ccffb9a2ea802e6522481a1f61602fc3f5a5d
+GitCommit: 943e55d314b4540c322fc9ac42e04dbda8ac01c1
 Directory: 31/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 0a635c4..0ec9183 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ nextcloud:30.0
 nextcloud:30.0-apache
 nextcloud:30.0-fpm
 nextcloud:30.0-fpm-alpine
-nextcloud:30.0.13
-nextcloud:30.0.13-apache
-nextcloud:30.0.13-fpm
-nextcloud:30.0.13-fpm-alpine
+nextcloud:30.0.14
+nextcloud:30.0.14-apache
+nextcloud:30.0.14-fpm
+nextcloud:30.0.14-fpm-alpine
 nextcloud:31
 nextcloud:31-apache
 nextcloud:31-fpm
@@ -18,19 +18,11 @@ nextcloud:31.0
 nextcloud:31.0-apache
 nextcloud:31.0-fpm
 nextcloud:31.0-fpm-alpine
-nextcloud:31.0.7
-nextcloud:31.0.7-apache
-nextcloud:31.0.7-fpm
-nextcloud:31.0.7-fpm-alpine
+nextcloud:31.0.8
+nextcloud:31.0.8-apache
+nextcloud:31.0.8-fpm
+nextcloud:31.0.8-fpm-alpine
 nextcloud:apache
 nextcloud:fpm
 nextcloud:fpm-alpine
 nextcloud:latest
-nextcloud:production
-nextcloud:production-apache
-nextcloud:production-fpm
-nextcloud:production-fpm-alpine
-nextcloud:stable
-nextcloud:stable-apache
-nextcloud:stable-fpm
-nextcloud:stable-fpm-alpine
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index e2926bd..f434402 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,6 @@
 nextcloud:30
 nextcloud:30-fpm
 nextcloud:30-fpm-alpine
-nextcloud:production
-nextcloud:production-fpm
-nextcloud:production-fpm-alpine
+nextcloud:fpm
+nextcloud:fpm-alpine
+nextcloud:latest
diff --git a/nextcloud_30-fpm-alpine/Dockerfile b/nextcloud_30-fpm-alpine/Dockerfile
index 5a6c4e8..53dba22 100644
--- a/nextcloud_30-fpm-alpine/Dockerfile
+++ b/nextcloud_30-fpm-alpine/Dockerfile
@@ -54,7 +54,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -130,7 +129,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 +137,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/nextcloud_30-fpm/Dockerfile b/nextcloud_30-fpm/Dockerfile
index c4177d7..0a66b4e 100644
--- a/nextcloud_30-fpm/Dockerfile
+++ b/nextcloud_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
@@ -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; \
@@ -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/nextcloud_30/Dockerfile b/nextcloud_30/Dockerfile
index d732de2..845e1e7 100644
--- a/nextcloud_30/Dockerfile
+++ b/nextcloud_30/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
@@ -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; \
@@ -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/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
similarity index 97%
rename from nextcloud_production-fpm-alpine/Dockerfile
rename to nextcloud_fpm-alpine/Dockerfile
index 4ceef72..19b0426 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -54,7 +54,6 @@ RUN set -ex; \
         gmp \
         intl \
         ldap \
-        opcache \
         pcntl \
         pdo_mysql \
         pdo_pgsql \
@@ -130,7 +129,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 +137,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/nextcloud_production-fpm-alpine/config/apcu.config.php b/nextcloud_fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apcu.config.php
rename to nextcloud_fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_production-fpm-alpine/config/apps.config.php b/nextcloud_fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apps.config.php
rename to nextcloud_fpm-alpine/config/apps.config.php
diff --git a/nextcloud_production-fpm-alpine/config/autoconfig.php b/nextcloud_fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/autoconfig.php
rename to nextcloud_fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_production-fpm-alpine/config/redis.config.php b/nextcloud_fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/redis.config.php
rename to nextcloud_fpm-alpine/config/redis.config.php
diff --git a/nextcloud_production-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_production-fpm-alpine/config/s3.config.php b/nextcloud_fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/s3.config.php
rename to nextcloud_fpm-alpine/config/s3.config.php
diff --git a/nextcloud_production-fpm-alpine/config/smtp.config.php b/nextcloud_fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/smtp.config.php
rename to nextcloud_fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_production-fpm-alpine/config/swift.config.php b/nextcloud_fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/swift.config.php
rename to nextcloud_fpm-alpine/config/swift.config.php
diff --git a/nextcloud_production-fpm-alpine/config/upgrade-disable-web.config.php b/nextcloud_fpm-alpine/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/upgrade-disable-web.config.php
rename to nextcloud_fpm-alpine/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production-fpm-alpine/cron.sh b/nextcloud_fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/cron.sh
rename to nextcloud_fpm-alpine/cron.sh
diff --git a/nextcloud_production-fpm-alpine/entrypoint.sh b/nextcloud_fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/entrypoint.sh
rename to nextcloud_fpm-alpine/entrypoint.sh
diff --git a/nextcloud_production-fpm-alpine/upgrade.exclude b/nextcloud_fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm-alpine/upgrade.exclude
rename to nextcloud_fpm-alpine/upgrade.exclude
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_fpm/Dockerfile
similarity index 90%
rename from nextcloud_production-fpm/Dockerfile
rename to nextcloud_fpm/Dockerfile
index 9cfa46d..78610be 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_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
@@ -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; \
@@ -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/nextcloud_production-fpm/config/apcu.config.php b/nextcloud_fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apcu.config.php
rename to nextcloud_fpm/config/apcu.config.php
diff --git a/nextcloud_production-fpm/config/apps.config.php b/nextcloud_fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apps.config.php
rename to nextcloud_fpm/config/apps.config.php
diff --git a/nextcloud_production-fpm/config/autoconfig.php b/nextcloud_fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm/config/autoconfig.php
rename to nextcloud_fpm/config/autoconfig.php
diff --git a/nextcloud_production-fpm/config/redis.config.php b/nextcloud_fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/redis.config.php
rename to nextcloud_fpm/config/redis.config.php
diff --git a/nextcloud_production-fpm/config/reverse-proxy.config.php b/nextcloud_fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/reverse-proxy.config.php
rename to nextcloud_fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_production-fpm/config/s3.config.php b/nextcloud_fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/s3.config.php
rename to nextcloud_fpm/config/s3.config.php
diff --git a/nextcloud_production-fpm/config/smtp.config.php b/nextcloud_fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/smtp.config.php
rename to nextcloud_fpm/config/smtp.config.php
diff --git a/nextcloud_production-fpm/config/swift.config.php b/nextcloud_fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/swift.config.php
rename to nextcloud_fpm/config/swift.config.php
diff --git a/nextcloud_production-fpm/config/upgrade-disable-web.config.php b/nextcloud_fpm/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/upgrade-disable-web.config.php
rename to nextcloud_fpm/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production-fpm/cron.sh b/nextcloud_fpm/cron.sh
similarity index 100%
rename from nextcloud_production-fpm/cron.sh
rename to nextcloud_fpm/cron.sh
diff --git a/nextcloud_production-fpm/entrypoint.sh b/nextcloud_fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_production-fpm/entrypoint.sh
rename to nextcloud_fpm/entrypoint.sh
diff --git a/nextcloud_production-fpm/upgrade.exclude b/nextcloud_fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm/upgrade.exclude
rename to nextcloud_fpm/upgrade.exclude
diff --git a/nextcloud_production/Dockerfile b/nextcloud_latest/Dockerfile
similarity index 91%
rename from nextcloud_production/Dockerfile
rename to nextcloud_latest/Dockerfile
index cbcd224..f559d09 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_latest/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
@@ -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; \
@@ -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/nextcloud_production/config/apache-pretty-urls.config.php b/nextcloud_latest/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_production/config/apache-pretty-urls.config.php
rename to nextcloud_latest/config/apache-pretty-urls.config.php
diff --git a/nextcloud_production/config/apcu.config.php b/nextcloud_latest/config/apcu.config.php
similarity index 100%
rename from nextcloud_production/config/apcu.config.php
rename to nextcloud_latest/config/apcu.config.php
diff --git a/nextcloud_production/config/apps.config.php b/nextcloud_latest/config/apps.config.php
similarity index 100%
rename from nextcloud_production/config/apps.config.php
rename to nextcloud_latest/config/apps.config.php
diff --git a/nextcloud_production/config/autoconfig.php b/nextcloud_latest/config/autoconfig.php
similarity index 100%
rename from nextcloud_production/config/autoconfig.php
rename to nextcloud_latest/config/autoconfig.php
diff --git a/nextcloud_production/config/redis.config.php b/nextcloud_latest/config/redis.config.php
similarity index 100%
rename from nextcloud_production/config/redis.config.php
rename to nextcloud_latest/config/redis.config.php
diff --git a/nextcloud_production/config/reverse-proxy.config.php b/nextcloud_latest/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production/config/reverse-proxy.config.php
rename to nextcloud_latest/config/reverse-proxy.config.php
diff --git a/nextcloud_production/config/s3.config.php b/nextcloud_latest/config/s3.config.php
similarity index 100%
rename from nextcloud_production/config/s3.config.php
rename to nextcloud_latest/config/s3.config.php
diff --git a/nextcloud_production/config/smtp.config.php b/nextcloud_latest/config/smtp.config.php
similarity index 100%
rename from nextcloud_production/config/smtp.config.php
rename to nextcloud_latest/config/smtp.config.php
diff --git a/nextcloud_production/config/swift.config.php b/nextcloud_latest/config/swift.config.php
similarity index 100%
rename from nextcloud_production/config/swift.config.php
rename to nextcloud_latest/config/swift.config.php
diff --git a/nextcloud_production/config/upgrade-disable-web.config.php b/nextcloud_latest/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production/config/upgrade-disable-web.config.php
rename to nextcloud_latest/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production/cron.sh b/nextcloud_latest/cron.sh
similarity index 100%
rename from nextcloud_production/cron.sh
rename to nextcloud_latest/cron.sh
diff --git a/nextcloud_production/entrypoint.sh b/nextcloud_latest/entrypoint.sh
similarity index 100%
rename from nextcloud_production/entrypoint.sh
rename to nextcloud_latest/entrypoint.sh
diff --git a/nextcloud_production/upgrade.exclude b/nextcloud_latest/upgrade.exclude
similarity index 100%
rename from nextcloud_production/upgrade.exclude
rename to nextcloud_latest/upgrade.exclude

Relevant Maintainers:

@tianon tianon merged commit 9e22595 into docker-library:master Aug 14, 2025
11 checks passed
Muscraft pushed a commit to Muscraft/official-images that referenced this pull request Aug 19, 2025
@J0WI J0WI deleted the nextcloud-31.0.8 branch August 28, 2025 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants