Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Feb 3, 2022

This adjusts nextcloud-apache-run and nextcloud-fpm-run to try up to three times for a successful result, and adds a new nextcloud-cli test that combines the other three (nextcloud-cli-mysql, nextcloud-cli-postgres, and nextcloud-cli-sqlite) into a single test that will pass if any one of them passes (but does attempt to run all three every time).

Also, account for change in the installation page (from "Finish setup" to "Install"): nextcloud/server#30615

See also #6252

(This includes #11787 to actually run the tests, especially since that update includes the above linked change to the installation page.)

cc @J0WI @tilosp

@tianon tianon force-pushed the nextcloud-tests branch 2 times, most recently from 97a013f to d9c6dde Compare February 3, 2022 22:26

# Check that we can request / and that it contains the pattern "Finish setup" somewhere
# <input type="submit" class="primary" value="Finish setup" data-finishing="Finishing …">
_request GET '/' | grep -i "Finish setup" > /dev/null
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not at a computer right this second, but did this message change, maybe? 😂😅🙈

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This adjusts `nextcloud-apache-run` and `nextcloud-fpm-run` to try up to three times for a successful result, and adds a new `nextcloud-cli` test that combines the other three (`nextcloud-cli-mysql`, `nextcloud-cli-postgres`, and `nextcloud-cli-sqlite`) into a single test that will pass if any one of them passes (but does attempt to run all three every time).

Also, account for change in the installation page (from "Finish setup" to "Install").
@github-actions
Copy link

github-actions bot commented Feb 4, 2022

Diff for df28769:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2b46251..d53f67e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,47 +1,47 @@
 Maintainers: Nextcloud <[email protected]> (@nextcloud)
 GitRepo: https://github.com/nextcloud/docker.git
 
-Tags: 21.0.7-apache, 21.0-apache, 21-apache, 21.0.7, 21.0, 21
+Tags: 21.0.8-apache, 21.0-apache, 21-apache, 21.0.8, 21.0, 21
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 905972656ea10c399f8f971b96adbdcbd9460d1f
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 21/apache
 
-Tags: 21.0.7-fpm, 21.0-fpm, 21-fpm
+Tags: 21.0.8-fpm, 21.0-fpm, 21-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 905972656ea10c399f8f971b96adbdcbd9460d1f
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 21/fpm
 
-Tags: 21.0.7-fpm-alpine, 21.0-fpm-alpine, 21-fpm-alpine
+Tags: 21.0.8-fpm-alpine, 21.0-fpm-alpine, 21-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5a189c719de104a886994f95489e8524d71e36b2
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 21/fpm-alpine
 
-Tags: 22.2.3-apache, 22.2-apache, 22-apache, stable-apache, production-apache, 22.2.3, 22.2, 22, stable, production
+Tags: 22.2.4-apache, 22.2-apache, 22-apache, 22.2.4, 22.2, 22
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 905972656ea10c399f8f971b96adbdcbd9460d1f
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 22/apache
 
-Tags: 22.2.3-fpm, 22.2-fpm, 22-fpm, stable-fpm, production-fpm
+Tags: 22.2.4-fpm, 22.2-fpm, 22-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 905972656ea10c399f8f971b96adbdcbd9460d1f
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 22/fpm
 
-Tags: 22.2.3-fpm-alpine, 22.2-fpm-alpine, 22-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 22.2.4-fpm-alpine, 22.2-fpm-alpine, 22-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5a189c719de104a886994f95489e8524d71e36b2
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 22/fpm-alpine
 
-Tags: 23.0.0-apache, 23.0-apache, 23-apache, apache, 23.0.0, 23.0, 23, latest
+Tags: 23.0.1-apache, 23.0-apache, 23-apache, apache, 23.0.1, 23.0, 23, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e2dc98dea469ba67c3e6474aa4fc2cf902f8e9a4
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 23/apache
 
-Tags: 23.0.0-fpm, 23.0-fpm, 23-fpm, fpm
+Tags: 23.0.1-fpm, 23.0-fpm, 23-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e2dc98dea469ba67c3e6474aa4fc2cf902f8e9a4
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 23/fpm
 
-Tags: 23.0.0-fpm-alpine, 23.0-fpm-alpine, 23-fpm-alpine, fpm-alpine
+Tags: 23.0.1-fpm-alpine, 23.0-fpm-alpine, 23-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5a189c719de104a886994f95489e8524d71e36b2
+GitCommit: dcf058fb559e7918cd77f5f1bb0dfdbcee813571
 Directory: 23/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 1a7bfaa..ad05c90 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ nextcloud:21.0
 nextcloud:21.0-apache
 nextcloud:21.0-fpm
 nextcloud:21.0-fpm-alpine
-nextcloud:21.0.7
-nextcloud:21.0.7-apache
-nextcloud:21.0.7-fpm
-nextcloud:21.0.7-fpm-alpine
+nextcloud:21.0.8
+nextcloud:21.0.8-apache
+nextcloud:21.0.8-fpm
+nextcloud:21.0.8-fpm-alpine
 nextcloud:22
 nextcloud:22-apache
 nextcloud:22-fpm
@@ -18,10 +18,10 @@ nextcloud:22.2
 nextcloud:22.2-apache
 nextcloud:22.2-fpm
 nextcloud:22.2-fpm-alpine
-nextcloud:22.2.3
-nextcloud:22.2.3-apache
-nextcloud:22.2.3-fpm
-nextcloud:22.2.3-fpm-alpine
+nextcloud:22.2.4
+nextcloud:22.2.4-apache
+nextcloud:22.2.4-fpm
+nextcloud:22.2.4-fpm-alpine
 nextcloud:23
 nextcloud:23-apache
 nextcloud:23-fpm
@@ -30,19 +30,11 @@ nextcloud:23.0
 nextcloud:23.0-apache
 nextcloud:23.0-fpm
 nextcloud:23.0-fpm-alpine
-nextcloud:23.0.0
-nextcloud:23.0.0-apache
-nextcloud:23.0.0-fpm
-nextcloud:23.0.0-fpm-alpine
+nextcloud:23.0.1
+nextcloud:23.0.1-apache
+nextcloud:23.0.1-fpm
+nextcloud:23.0.1-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/nextcloud_21-fpm-alpine/Dockerfile b/nextcloud_21-fpm-alpine/Dockerfile
index 42d92d3..f36e758 100644
--- a/nextcloud_21-fpm-alpine/Dockerfile
+++ b/nextcloud_21-fpm-alpine/Dockerfile
@@ -54,8 +54,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.7
+ENV NEXTCLOUD_VERSION 21.0.8
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_21-fpm/Dockerfile b/nextcloud_21-fpm/Dockerfile
index beac5c0..9764735 100644
--- a/nextcloud_21-fpm/Dockerfile
+++ b/nextcloud_21-fpm/Dockerfile
@@ -63,8 +63,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -114,7 +114,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.7
+ENV NEXTCLOUD_VERSION 21.0.8
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_21/Dockerfile b/nextcloud_21/Dockerfile
index 591c8d9..60529f9 100644
--- a/nextcloud_21/Dockerfile
+++ b/nextcloud_21/Dockerfile
@@ -63,8 +63,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -122,7 +122,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 21.0.7
+ENV NEXTCLOUD_VERSION 21.0.8
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_22-fpm-alpine/Dockerfile
similarity index 97%
rename from nextcloud_production-fpm-alpine/Dockerfile
rename to nextcloud_22-fpm-alpine/Dockerfile
index 7a8596b..d1c7001 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_22-fpm-alpine/Dockerfile
@@ -54,8 +54,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 22.2.3
+ENV NEXTCLOUD_VERSION 22.2.4
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_production-fpm-alpine/config/apcu.config.php b/nextcloud_22-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apcu.config.php
rename to nextcloud_22-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_production-fpm-alpine/config/apps.config.php b/nextcloud_22-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apps.config.php
rename to nextcloud_22-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_production-fpm-alpine/config/autoconfig.php b/nextcloud_22-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/autoconfig.php
rename to nextcloud_22-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_production-fpm-alpine/config/redis.config.php b/nextcloud_22-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/redis.config.php
rename to nextcloud_22-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_production-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_22-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_22-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_production-fpm-alpine/config/s3.config.php b/nextcloud_22-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/s3.config.php
rename to nextcloud_22-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_production-fpm-alpine/config/smtp.config.php b/nextcloud_22-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/smtp.config.php
rename to nextcloud_22-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_production-fpm-alpine/config/swift.config.php b/nextcloud_22-fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/swift.config.php
rename to nextcloud_22-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_production-fpm-alpine/cron.sh b/nextcloud_22-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/cron.sh
rename to nextcloud_22-fpm-alpine/cron.sh
diff --git a/nextcloud_production-fpm-alpine/entrypoint.sh b/nextcloud_22-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/entrypoint.sh
rename to nextcloud_22-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_production-fpm-alpine/upgrade.exclude b/nextcloud_22-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm-alpine/upgrade.exclude
rename to nextcloud_22-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_22-fpm/Dockerfile
similarity index 98%
rename from nextcloud_production-fpm/Dockerfile
rename to nextcloud_22-fpm/Dockerfile
index dacac86..569b796 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_22-fpm/Dockerfile
@@ -63,8 +63,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -114,7 +114,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 22.2.3
+ENV NEXTCLOUD_VERSION 22.2.4
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production-fpm/config/apcu.config.php b/nextcloud_22-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apcu.config.php
rename to nextcloud_22-fpm/config/apcu.config.php
diff --git a/nextcloud_production-fpm/config/apps.config.php b/nextcloud_22-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apps.config.php
rename to nextcloud_22-fpm/config/apps.config.php
diff --git a/nextcloud_production-fpm/config/autoconfig.php b/nextcloud_22-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm/config/autoconfig.php
rename to nextcloud_22-fpm/config/autoconfig.php
diff --git a/nextcloud_production-fpm/config/redis.config.php b/nextcloud_22-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/redis.config.php
rename to nextcloud_22-fpm/config/redis.config.php
diff --git a/nextcloud_production-fpm/config/reverse-proxy.config.php b/nextcloud_22-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/reverse-proxy.config.php
rename to nextcloud_22-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_production-fpm/config/s3.config.php b/nextcloud_22-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/s3.config.php
rename to nextcloud_22-fpm/config/s3.config.php
diff --git a/nextcloud_production-fpm/config/smtp.config.php b/nextcloud_22-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/smtp.config.php
rename to nextcloud_22-fpm/config/smtp.config.php
diff --git a/nextcloud_production-fpm/config/swift.config.php b/nextcloud_22-fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/swift.config.php
rename to nextcloud_22-fpm/config/swift.config.php
diff --git a/nextcloud_production-fpm/cron.sh b/nextcloud_22-fpm/cron.sh
similarity index 100%
rename from nextcloud_production-fpm/cron.sh
rename to nextcloud_22-fpm/cron.sh
diff --git a/nextcloud_production-fpm/entrypoint.sh b/nextcloud_22-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_production-fpm/entrypoint.sh
rename to nextcloud_22-fpm/entrypoint.sh
diff --git a/nextcloud_production-fpm/upgrade.exclude b/nextcloud_22-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm/upgrade.exclude
rename to nextcloud_22-fpm/upgrade.exclude
diff --git a/nextcloud_production/Dockerfile b/nextcloud_22/Dockerfile
similarity index 98%
rename from nextcloud_production/Dockerfile
rename to nextcloud_22/Dockerfile
index e870e6f..896d3cf 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_22/Dockerfile
@@ -63,8 +63,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -122,7 +122,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 22.2.3
+ENV NEXTCLOUD_VERSION 22.2.4
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production/config/apache-pretty-urls.config.php b/nextcloud_22/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_production/config/apache-pretty-urls.config.php
rename to nextcloud_22/config/apache-pretty-urls.config.php
diff --git a/nextcloud_production/config/apcu.config.php b/nextcloud_22/config/apcu.config.php
similarity index 100%
rename from nextcloud_production/config/apcu.config.php
rename to nextcloud_22/config/apcu.config.php
diff --git a/nextcloud_production/config/apps.config.php b/nextcloud_22/config/apps.config.php
similarity index 100%
rename from nextcloud_production/config/apps.config.php
rename to nextcloud_22/config/apps.config.php
diff --git a/nextcloud_production/config/autoconfig.php b/nextcloud_22/config/autoconfig.php
similarity index 100%
rename from nextcloud_production/config/autoconfig.php
rename to nextcloud_22/config/autoconfig.php
diff --git a/nextcloud_production/config/redis.config.php b/nextcloud_22/config/redis.config.php
similarity index 100%
rename from nextcloud_production/config/redis.config.php
rename to nextcloud_22/config/redis.config.php
diff --git a/nextcloud_production/config/reverse-proxy.config.php b/nextcloud_22/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production/config/reverse-proxy.config.php
rename to nextcloud_22/config/reverse-proxy.config.php
diff --git a/nextcloud_production/config/s3.config.php b/nextcloud_22/config/s3.config.php
similarity index 100%
rename from nextcloud_production/config/s3.config.php
rename to nextcloud_22/config/s3.config.php
diff --git a/nextcloud_production/config/smtp.config.php b/nextcloud_22/config/smtp.config.php
similarity index 100%
rename from nextcloud_production/config/smtp.config.php
rename to nextcloud_22/config/smtp.config.php
diff --git a/nextcloud_production/config/swift.config.php b/nextcloud_22/config/swift.config.php
similarity index 100%
rename from nextcloud_production/config/swift.config.php
rename to nextcloud_22/config/swift.config.php
diff --git a/nextcloud_production/cron.sh b/nextcloud_22/cron.sh
similarity index 100%
rename from nextcloud_production/cron.sh
rename to nextcloud_22/cron.sh
diff --git a/nextcloud_production/entrypoint.sh b/nextcloud_22/entrypoint.sh
similarity index 100%
rename from nextcloud_production/entrypoint.sh
rename to nextcloud_22/entrypoint.sh
diff --git a/nextcloud_production/upgrade.exclude b/nextcloud_22/upgrade.exclude
similarity index 100%
rename from nextcloud_production/upgrade.exclude
rename to nextcloud_22/upgrade.exclude
diff --git a/nextcloud_fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
index 714a188..10f92ef 100644
--- a/nextcloud_fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -54,8 +54,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 23.0.0
+ENV NEXTCLOUD_VERSION 23.0.1
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_fpm/Dockerfile b/nextcloud_fpm/Dockerfile
index 1fa86f2..f95cc89 100644
--- a/nextcloud_fpm/Dockerfile
+++ b/nextcloud_fpm/Dockerfile
@@ -63,8 +63,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -114,7 +114,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 23.0.0
+ENV NEXTCLOUD_VERSION 23.0.1
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_latest/Dockerfile
index b9d8030..674a14e 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_latest/Dockerfile
@@ -63,8 +63,8 @@ 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.21; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.4; \
-    pecl install imagick-3.5.1; \
+    pecl install redis-5.3.6; \
+    pecl install imagick-3.7.0; \
     \
     docker-php-ext-enable \
         apcu \
@@ -122,7 +122,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 23.0.0
+ENV NEXTCLOUD_VERSION 23.0.1
 
 RUN set -ex; \
     fetchDeps=" \

Relevant Maintainers:

@tianon
Copy link
Member Author

tianon commented Feb 4, 2022

Whew, fully green now! I've rebased at some point on #11787 's commit exactly, so if we merge this it should mark that one as merged too. 👀

@yosifkit yosifkit merged commit 9468970 into docker-library:master Feb 4, 2022
@yosifkit yosifkit deleted the nextcloud-tests branch February 4, 2022 01:18
@J0WI
Copy link
Contributor

J0WI commented Feb 4, 2022

Thanks a lot!

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.

4 participants