Update nextcloud image #8747
Merged
Update nextcloud image #8747
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for a1bf1e3:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ec48eb6..67741c5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -46,17 +46,17 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: d0ee4bc215e96245cd563114f15dc1146e7058c1
Directory: 19.0/fpm-alpine
-Tags: 20.0.0beta4-apache, 20.0.0-beta-apache, 20.0-beta-apache, 20-beta-apache, 20.0.0beta4, 20.0.0-beta, 20.0-beta, 20-beta
+Tags: 20.0.0RC1-apache, 20.0.0-rc-apache, 20.0-rc-apache, 20-rc-apache, 20.0.0RC1, 20.0.0-rc, 20.0-rc, 20-rc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9225c07b820b5fcb019633bbc3da527b81f11ff2
-Directory: 20.0-beta/apache
+GitCommit: df570ee1e3e46e3552fba2e01a7fcdc5bb306640
+Directory: 20.0-rc/apache
-Tags: 20.0.0beta4-fpm, 20.0.0-beta-fpm, 20.0-beta-fpm, 20-beta-fpm
+Tags: 20.0.0RC1-fpm, 20.0.0-rc-fpm, 20.0-rc-fpm, 20-rc-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9225c07b820b5fcb019633bbc3da527b81f11ff2
-Directory: 20.0-beta/fpm
+GitCommit: df570ee1e3e46e3552fba2e01a7fcdc5bb306640
+Directory: 20.0-rc/fpm
-Tags: 20.0.0beta4-fpm-alpine, 20.0.0-beta-fpm-alpine, 20.0-beta-fpm-alpine, 20-beta-fpm-alpine
+Tags: 20.0.0RC1-fpm-alpine, 20.0.0-rc-fpm-alpine, 20.0-rc-fpm-alpine, 20-rc-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9225c07b820b5fcb019633bbc3da527b81f11ff2
-Directory: 20.0-beta/fpm-alpine
+GitCommit: df570ee1e3e46e3552fba2e01a7fcdc5bb306640
+Directory: 20.0-rc/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 0a1c99e..5cc0586 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -34,22 +34,22 @@ nextcloud:19.0.3
nextcloud:19.0.3-apache
nextcloud:19.0.3-fpm
nextcloud:19.0.3-fpm-alpine
-nextcloud:20-beta
-nextcloud:20-beta-apache
-nextcloud:20-beta-fpm
-nextcloud:20-beta-fpm-alpine
-nextcloud:20.0-beta
-nextcloud:20.0-beta-apache
-nextcloud:20.0-beta-fpm
-nextcloud:20.0-beta-fpm-alpine
-nextcloud:20.0.0beta4
-nextcloud:20.0.0beta4-apache
-nextcloud:20.0.0beta4-fpm
-nextcloud:20.0.0beta4-fpm-alpine
-nextcloud:20.0.0-beta
-nextcloud:20.0.0-beta-apache
-nextcloud:20.0.0-beta-fpm
-nextcloud:20.0.0-beta-fpm-alpine
+nextcloud:20-rc
+nextcloud:20-rc-apache
+nextcloud:20-rc-fpm
+nextcloud:20-rc-fpm-alpine
+nextcloud:20.0-rc
+nextcloud:20.0-rc-apache
+nextcloud:20.0-rc-fpm
+nextcloud:20.0-rc-fpm-alpine
+nextcloud:20.0.0RC1
+nextcloud:20.0.0RC1-apache
+nextcloud:20.0.0RC1-fpm
+nextcloud:20.0.0RC1-fpm-alpine
+nextcloud:20.0.0-rc
+nextcloud:20.0.0-rc-apache
+nextcloud:20.0.0-rc-fpm
+nextcloud:20.0.0-rc-fpm-alpine
nextcloud:apache
nextcloud:fpm
nextcloud:fpm-alpine
diff --git a/nextcloud_20-beta-fpm-alpine/Dockerfile b/nextcloud_20-rc-fpm-alpine/Dockerfile
similarity index 99%
rename from nextcloud_20-beta-fpm-alpine/Dockerfile
rename to nextcloud_20-rc-fpm-alpine/Dockerfile
index 89b100e..a558fb2 100644
--- a/nextcloud_20-beta-fpm-alpine/Dockerfile
+++ b/nextcloud_20-rc-fpm-alpine/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 20.0.0beta4
+ENV NEXTCLOUD_VERSION 20.0.0RC1
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_20-beta-fpm-alpine/config/apcu.config.php b/nextcloud_20-rc-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/config/apcu.config.php
rename to nextcloud_20-rc-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_20-beta-fpm-alpine/config/apps.config.php b/nextcloud_20-rc-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/config/apps.config.php
rename to nextcloud_20-rc-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_20-beta-fpm-alpine/config/autoconfig.php b/nextcloud_20-rc-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/config/autoconfig.php
rename to nextcloud_20-rc-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_20-beta-fpm-alpine/config/redis.config.php b/nextcloud_20-rc-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/config/redis.config.php
rename to nextcloud_20-rc-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_20-beta-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_20-rc-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_20-rc-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_20-beta-fpm-alpine/config/s3.config.php b/nextcloud_20-rc-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/config/s3.config.php
rename to nextcloud_20-rc-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_20-beta-fpm-alpine/config/smtp.config.php b/nextcloud_20-rc-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/config/smtp.config.php
rename to nextcloud_20-rc-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_20-beta-fpm-alpine/cron.sh b/nextcloud_20-rc-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/cron.sh
rename to nextcloud_20-rc-fpm-alpine/cron.sh
diff --git a/nextcloud_20-beta-fpm-alpine/entrypoint.sh b/nextcloud_20-rc-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/entrypoint.sh
rename to nextcloud_20-rc-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_20-beta-fpm-alpine/upgrade.exclude b/nextcloud_20-rc-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_20-beta-fpm-alpine/upgrade.exclude
rename to nextcloud_20-rc-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_20-beta-fpm/Dockerfile b/nextcloud_20-rc-fpm/Dockerfile
similarity index 99%
rename from nextcloud_20-beta-fpm/Dockerfile
rename to nextcloud_20-rc-fpm/Dockerfile
index ca10cd5..bad34e1 100644
--- a/nextcloud_20-beta-fpm/Dockerfile
+++ b/nextcloud_20-rc-fpm/Dockerfile
@@ -106,7 +106,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 20.0.0beta4
+ENV NEXTCLOUD_VERSION 20.0.0RC1
RUN set -ex; \
fetchDeps=" \
diff --git a/nextcloud_20-beta-fpm/config/apcu.config.php b/nextcloud_20-rc-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm/config/apcu.config.php
rename to nextcloud_20-rc-fpm/config/apcu.config.php
diff --git a/nextcloud_20-beta-fpm/config/apps.config.php b/nextcloud_20-rc-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm/config/apps.config.php
rename to nextcloud_20-rc-fpm/config/apps.config.php
diff --git a/nextcloud_20-beta-fpm/config/autoconfig.php b/nextcloud_20-rc-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_20-beta-fpm/config/autoconfig.php
rename to nextcloud_20-rc-fpm/config/autoconfig.php
diff --git a/nextcloud_20-beta-fpm/config/redis.config.php b/nextcloud_20-rc-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm/config/redis.config.php
rename to nextcloud_20-rc-fpm/config/redis.config.php
diff --git a/nextcloud_20-beta-fpm/config/reverse-proxy.config.php b/nextcloud_20-rc-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm/config/reverse-proxy.config.php
rename to nextcloud_20-rc-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_20-beta-fpm/config/s3.config.php b/nextcloud_20-rc-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm/config/s3.config.php
rename to nextcloud_20-rc-fpm/config/s3.config.php
diff --git a/nextcloud_20-beta-fpm/config/smtp.config.php b/nextcloud_20-rc-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_20-beta-fpm/config/smtp.config.php
rename to nextcloud_20-rc-fpm/config/smtp.config.php
diff --git a/nextcloud_20-beta-fpm/cron.sh b/nextcloud_20-rc-fpm/cron.sh
similarity index 100%
rename from nextcloud_20-beta-fpm/cron.sh
rename to nextcloud_20-rc-fpm/cron.sh
diff --git a/nextcloud_20-beta-fpm/entrypoint.sh b/nextcloud_20-rc-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_20-beta-fpm/entrypoint.sh
rename to nextcloud_20-rc-fpm/entrypoint.sh
diff --git a/nextcloud_20-beta-fpm/upgrade.exclude b/nextcloud_20-rc-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_20-beta-fpm/upgrade.exclude
rename to nextcloud_20-rc-fpm/upgrade.exclude
diff --git a/nextcloud_20-beta/Dockerfile b/nextcloud_20-rc/Dockerfile
similarity index 99%
rename from nextcloud_20-beta/Dockerfile
rename to nextcloud_20-rc/Dockerfile
index 10a94da..661a86a 100644
--- a/nextcloud_20-beta/Dockerfile
+++ b/nextcloud_20-rc/Dockerfile
@@ -114,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 20.0.0beta4
+ENV NEXTCLOUD_VERSION 20.0.0RC1
RUN set -ex; \
fetchDeps=" \
diff --git a/nextcloud_20-beta/config/apache-pretty-urls.config.php b/nextcloud_20-rc/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_20-beta/config/apache-pretty-urls.config.php
rename to nextcloud_20-rc/config/apache-pretty-urls.config.php
diff --git a/nextcloud_20-beta/config/apcu.config.php b/nextcloud_20-rc/config/apcu.config.php
similarity index 100%
rename from nextcloud_20-beta/config/apcu.config.php
rename to nextcloud_20-rc/config/apcu.config.php
diff --git a/nextcloud_20-beta/config/apps.config.php b/nextcloud_20-rc/config/apps.config.php
similarity index 100%
rename from nextcloud_20-beta/config/apps.config.php
rename to nextcloud_20-rc/config/apps.config.php
diff --git a/nextcloud_20-beta/config/autoconfig.php b/nextcloud_20-rc/config/autoconfig.php
similarity index 100%
rename from nextcloud_20-beta/config/autoconfig.php
rename to nextcloud_20-rc/config/autoconfig.php
diff --git a/nextcloud_20-beta/config/redis.config.php b/nextcloud_20-rc/config/redis.config.php
similarity index 100%
rename from nextcloud_20-beta/config/redis.config.php
rename to nextcloud_20-rc/config/redis.config.php
diff --git a/nextcloud_20-beta/config/reverse-proxy.config.php b/nextcloud_20-rc/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_20-beta/config/reverse-proxy.config.php
rename to nextcloud_20-rc/config/reverse-proxy.config.php
diff --git a/nextcloud_20-beta/config/s3.config.php b/nextcloud_20-rc/config/s3.config.php
similarity index 100%
rename from nextcloud_20-beta/config/s3.config.php
rename to nextcloud_20-rc/config/s3.config.php
diff --git a/nextcloud_20-beta/config/smtp.config.php b/nextcloud_20-rc/config/smtp.config.php
similarity index 100%
rename from nextcloud_20-beta/config/smtp.config.php
rename to nextcloud_20-rc/config/smtp.config.php
diff --git a/nextcloud_20-beta/cron.sh b/nextcloud_20-rc/cron.sh
similarity index 100%
rename from nextcloud_20-beta/cron.sh
rename to nextcloud_20-rc/cron.sh
diff --git a/nextcloud_20-beta/entrypoint.sh b/nextcloud_20-rc/entrypoint.sh
similarity index 100%
rename from nextcloud_20-beta/entrypoint.sh
rename to nextcloud_20-rc/entrypoint.sh
diff --git a/nextcloud_20-beta/upgrade.exclude b/nextcloud_20-rc/upgrade.exclude
similarity index 100%
rename from nextcloud_20-beta/upgrade.exclude
rename to nextcloud_20-rc/upgrade.exclude |
This comment has been minimized.
This comment has been minimized.
|
Just regular flaky tests: Test nextcloud:18.0.9-apache
'nextcloud-cli-postgres' [6/8]...failed
Test nextcloud:18.0.9-fpm
'nextcloud-cli-postgres' [6/8]...failed
Test nextcloud:20.0.0RC1-apache
'nextcloud-cli-postgres' [6/8]...failed
Test nextcloud:20.0.0RC1-fpm
'nextcloud-cli-postgres' [6/8]...failed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
nextcloud/docker@df570ee
nextcloud/docker@0607fe6
nextcloud/docker@9225c07...0607fe6
CC: @tilosp