Update nextcloud image

[tilosp-bot]

nextcloud/docker@84b2618
nextcloud/docker@f9ef314
nextcloud/docker@1e70224
nextcloud/docker@baebdfe

nextcloud/docker@f199880...baebdfe

CC: @tilosp

[github-actions]

Diff for 79494d6:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 02ed5f9..e8d4cf7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,45 +3,45 @@ GitRepo: https://github.com/nextcloud/docker.git
 
 Tags: 17.0.7-apache, 17.0-apache, 17-apache, production-apache, 17.0.7, 17.0, 17, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: f9ef31431dc0be4b4e2227e90f6a336492da661c
 Directory: 17.0/apache
 
 Tags: 17.0.7-fpm, 17.0-fpm, 17-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: f9ef31431dc0be4b4e2227e90f6a336492da661c
 Directory: 17.0/fpm
 
 Tags: 17.0.7-fpm-alpine, 17.0-fpm-alpine, 17-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: 1e702241082208e0af748370786d2ec18df39246
 Directory: 17.0/fpm-alpine
 
 Tags: 18.0.6-apache, 18.0-apache, 18-apache, stable-apache, 18.0.6, 18.0, 18, stable
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: f9ef31431dc0be4b4e2227e90f6a336492da661c
 Directory: 18.0/apache
 
 Tags: 18.0.6-fpm, 18.0-fpm, 18-fpm, stable-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: f9ef31431dc0be4b4e2227e90f6a336492da661c
 Directory: 18.0/fpm
 
 Tags: 18.0.6-fpm-alpine, 18.0-fpm-alpine, 18-fpm-alpine, stable-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: 1e702241082208e0af748370786d2ec18df39246
 Directory: 18.0/fpm-alpine
 
 Tags: 19.0.0-apache, 19.0-apache, 19-apache, apache, 19.0.0, 19.0, 19, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: f9ef31431dc0be4b4e2227e90f6a336492da661c
 Directory: 19.0/apache
 
 Tags: 19.0.0-fpm, 19.0-fpm, 19-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: f9ef31431dc0be4b4e2227e90f6a336492da661c
 Directory: 19.0/fpm
 
 Tags: 19.0.0-fpm-alpine, 19.0-fpm-alpine, 19-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 3ac6fde8d6ed3c13cea1e39d5957ef6be9b6b210
+GitCommit: 1e702241082208e0af748370786d2ec18df39246
 Directory: 19.0/fpm-alpine
diff --git a/nextcloud_fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
index d8b7215..8860a2d 100644
--- a/nextcloud_fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.4-fpm-alpine3.11
+FROM php:7.4-fpm-alpine3.12
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -113,8 +113,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
diff --git a/nextcloud_fpm/Dockerfile b/nextcloud_fpm/Dockerfile
index fa7f6bd..99e9725 100644
--- a/nextcloud_fpm/Dockerfile
+++ b/nextcloud_fpm/Dockerfile
@@ -126,8 +126,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_latest/Dockerfile
index 392630c..259c43c 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_latest/Dockerfile
@@ -134,8 +134,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index 4322b08..3abe039 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.11
+FROM php:7.3-fpm-alpine3.12
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -112,8 +112,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 1a4c8e2..d181501 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -127,8 +127,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index 9b0f9df..54f4b68 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/Dockerfile
@@ -135,8 +135,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
diff --git a/nextcloud_stable-fpm-alpine/Dockerfile b/nextcloud_stable-fpm-alpine/Dockerfile
index 70713bb..ad2491f 100644
--- a/nextcloud_stable-fpm-alpine/Dockerfile
+++ b/nextcloud_stable-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.11
+FROM php:7.3-fpm-alpine3.12
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -112,8 +112,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
diff --git a/nextcloud_stable-fpm/Dockerfile b/nextcloud_stable-fpm/Dockerfile
index 173c80c..3498f03 100644
--- a/nextcloud_stable-fpm/Dockerfile
+++ b/nextcloud_stable-fpm/Dockerfile
@@ -127,8 +127,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \
diff --git a/nextcloud_stable/Dockerfile b/nextcloud_stable/Dockerfile
index 1944476..3a77174 100644
--- a/nextcloud_stable/Dockerfile
+++ b/nextcloud_stable/Dockerfile
@@ -135,8 +135,8 @@ RUN set -ex; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
-    rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    rm -rf /usr/src/nextcloud/updater; \
+    rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+    rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
     mkdir -p /usr/src/nextcloud/data; \
     mkdir -p /usr/src/nextcloud/custom_apps; \
     chmod +x /usr/src/nextcloud/occ; \

[tilosp]

Any idea on how to make the tests more stable?

I would guess that giving nextcloud more time to setup, should solve this since nextcloud-cli-mysql, nextcloud-cli-postgres and nextcloud-cli-sqlite all seem to fail sometimes.
Running occ app:list 30 times probably produces a really inconsistent delay. Maybe adding a sleep there would fix this.

[tianon]

I don't think it's a timeout-related issue -- since the tests use retry.sh, it already includes a sleep between retries which defaults to 2 seconds (so with 30 retries, that's already 60+ seconds).

When I tested this manually (granted, months ago, so my memory is definitely hazy), I recall being able to reproduce this while testing by hand, and found that when the failure reproduces, no amount of time is "enough" for it to fix itself (so I think there's something that goes wrong in the initialization that's causing it).

See #6252 for where we've discussed this previously (and tested with larger retries, which did not fix the flakiness).