Merge pull request #19980 from J0WI/nextcloud-32.0.0

Update Nextcloud

Author: tianon

library/nextcloud

@@ -18,17 +18,32 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: f5b7b40808604dd61411d0f7a775ac5ff29a974b
 Directory: 30/fpm-alpine
 
-Tags: 31.0.9-apache, 31.0-apache, 31-apache, apache, stable-apache, production-apache, 31.0.9, 31.0, 31, latest, stable, production
+Tags: 31.0.9-apache, 31.0-apache, 31-apache, stable-apache, production-apache, 31.0.9, 31.0, 31, stable, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: f5b7b40808604dd61411d0f7a775ac5ff29a974b
 Directory: 31/apache
 
-Tags: 31.0.9-fpm, 31.0-fpm, 31-fpm, fpm, stable-fpm, production-fpm
+Tags: 31.0.9-fpm, 31.0-fpm, 31-fpm, stable-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: f5b7b40808604dd61411d0f7a775ac5ff29a974b
 Directory: 31/fpm
 
-Tags: 31.0.9-fpm-alpine, 31.0-fpm-alpine, 31-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 31.0.9-fpm-alpine, 31.0-fpm-alpine, 31-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: f5b7b40808604dd61411d0f7a775ac5ff29a974b
 Directory: 31/fpm-alpine
+
+Tags: 32.0.0-apache, 32.0-apache, 32-apache, apache, 32.0.0, 32.0, 32, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 1f87830fd6f478c993248475979472aab1787a75
+Directory: 32/apache
+
+Tags: 32.0.0-fpm, 32.0-fpm, 32-fpm, fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 1f87830fd6f478c993248475979472aab1787a75
+Directory: 32/fpm
+
+Tags: 32.0.0-fpm-alpine, 32.0-fpm-alpine, 32-fpm-alpine, fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 1f87830fd6f478c993248475979472aab1787a75
+Directory: 32/fpm-alpine

test/tests/nextcloud-apache-run/real-run.sh

@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 serverImage="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:buster-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
@@ -35,5 +35,5 @@ _request() {
 
 # Check that we can request / and that it contains the pattern "Install" somewhere
 # <input type="submit" class="primary" value="Install" data-finishing="Installing …">
-_request GET '/' | grep -i '"Install"' > /dev/null
+_request GET '/' | grep -i -F -- 'a safe home for all your data' > /dev/null
 # (https://github.com/nextcloud/server/blob/68b2463107774bed28ee9e77b44e7395d49dacee/core/templates/installation.php#L164)

test/tests/nextcloud-fpm-run/real-run.sh

@@ -8,9 +8,9 @@ image="$1"
 # Build a client image with cgi-fcgi for testing
 clientImage='librarytest/nextcloud-fpm-run:fcgi-client'
 docker build -t "$clientImage" - > /dev/null <<'EOF'
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
-RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && rm -rf /var/lib/apt/lists/*
+RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && apt-get dist-clean
 
 ENTRYPOINT ["cgi-fcgi"]
 EOF
@@ -45,5 +45,5 @@ fcgi-request() {
 
 # Check that we can request / and that it contains the pattern "Install" somewhere
 # <input type="submit" class="primary" value="Install" data-finishing="Installing …">
-fcgi-request GET '/index.php' | grep -i '"Install"' > /dev/null
+fcgi-request GET '/index.php' | grep -i -F -- 'a safe home for all your data' > /dev/null
 # (https://github.com/nextcloud/server/blob/68b2463107774bed28ee9e77b44e7395d49dacee/core/templates/installation.php#L164)