Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nextcloud #8835

Merged
merged 1 commit into from
Oct 5, 2020
Merged

Update nextcloud #8835

merged 1 commit into from
Oct 5, 2020

Conversation

tilosp
Copy link
Contributor

@tilosp tilosp commented Oct 3, 2020

No description provided.

Signed-off-by: Tilo Spannagel <development@tilosp.de>
@github-actions
Copy link

github-actions bot commented Oct 3, 2020

Diff for 8ac3a94:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 598b7c2..3c5774f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,6 +16,21 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 17.0/fpm-alpine
 
+Tags: 17.0.10RC1-apache, 17.0.10-rc-apache, 17.0-rc-apache, 17-rc-apache, 17.0.10RC1, 17.0.10-rc, 17.0-rc, 17-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 17.0-rc/apache
+
+Tags: 17.0.10RC1-fpm, 17.0.10-rc-fpm, 17.0-rc-fpm, 17-rc-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 17.0-rc/fpm
+
+Tags: 17.0.10RC1-fpm-alpine, 17.0.10-rc-fpm-alpine, 17.0-rc-fpm-alpine, 17-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 17.0-rc/fpm-alpine
+
 Tags: 18.0.9-apache, 18.0-apache, 18-apache, 18.0.9, 18.0, 18
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
@@ -31,32 +46,62 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 18.0/fpm-alpine
 
-Tags: 19.0.3-apache, 19.0-apache, 19-apache, apache, stable-apache, production-apache, 19.0.3, 19.0, 19, latest, stable, production
+Tags: 18.0.10RC1-apache, 18.0.10-rc-apache, 18.0-rc-apache, 18-rc-apache, 18.0.10RC1, 18.0.10-rc, 18.0-rc, 18-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 18.0-rc/apache
+
+Tags: 18.0.10RC1-fpm, 18.0.10-rc-fpm, 18.0-rc-fpm, 18-rc-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 18.0-rc/fpm
+
+Tags: 18.0.10RC1-fpm-alpine, 18.0.10-rc-fpm-alpine, 18.0-rc-fpm-alpine, 18-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 18.0-rc/fpm-alpine
+
+Tags: 19.0.3-apache, 19.0-apache, 19-apache, stable-apache, production-apache, 19.0.3, 19.0, 19, stable, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 19.0/apache
 
-Tags: 19.0.3-fpm, 19.0-fpm, 19-fpm, fpm, stable-fpm, production-fpm
+Tags: 19.0.3-fpm, 19.0-fpm, 19-fpm, stable-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 19.0/fpm
 
-Tags: 19.0.3-fpm-alpine, 19.0-fpm-alpine, 19-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 19.0.3-fpm-alpine, 19.0-fpm-alpine, 19-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 19.0/fpm-alpine
 
-Tags: 20.0.0RC2-apache, 20.0.0-rc-apache, 20.0-rc-apache, 20-rc-apache, 20.0.0RC2, 20.0.0-rc, 20.0-rc, 20-rc
+Tags: 19.0.4RC1-apache, 19.0.4-rc-apache, 19.0-rc-apache, 19-rc-apache, 19.0.4RC1, 19.0.4-rc, 19.0-rc, 19-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 19.0-rc/apache
+
+Tags: 19.0.4RC1-fpm, 19.0.4-rc-fpm, 19.0-rc-fpm, 19-rc-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 19.0-rc/fpm
+
+Tags: 19.0.4RC1-fpm-alpine, 19.0.4-rc-fpm-alpine, 19.0-rc-fpm-alpine, 19-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: cd8807c0a8d28f583990da6fda51f663a25d27df
+Directory: 19.0-rc/fpm-alpine
+
+Tags: 20.0.0-apache, 20.0-apache, 20-apache, apache, 20.0.0, 20.0, 20, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ae77b5ab9f8b85ecbaf3311b964919cfdafff02b
-Directory: 20.0-rc/apache
+GitCommit: 2161012fb80fd24ad85bcdf62d2dd77af1465333
+Directory: 20.0/apache
 
-Tags: 20.0.0RC2-fpm, 20.0.0-rc-fpm, 20.0-rc-fpm, 20-rc-fpm
+Tags: 20.0.0-fpm, 20.0-fpm, 20-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ae77b5ab9f8b85ecbaf3311b964919cfdafff02b
-Directory: 20.0-rc/fpm
+GitCommit: 2161012fb80fd24ad85bcdf62d2dd77af1465333
+Directory: 20.0/fpm
 
-Tags: 20.0.0RC2-fpm-alpine, 20.0.0-rc-fpm-alpine, 20.0-rc-fpm-alpine, 20-rc-fpm-alpine
+Tags: 20.0.0-fpm-alpine, 20.0-fpm-alpine, 20-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ae77b5ab9f8b85ecbaf3311b964919cfdafff02b
-Directory: 20.0-rc/fpm-alpine
+GitCommit: 2161012fb80fd24ad85bcdf62d2dd77af1465333
+Directory: 20.0/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index e29dc9b..0c324c3 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,54 +2,98 @@ nextcloud:17
 nextcloud:17-apache
 nextcloud:17-fpm
 nextcloud:17-fpm-alpine
+nextcloud:17-rc
+nextcloud:17-rc-apache
+nextcloud:17-rc-fpm
+nextcloud:17-rc-fpm-alpine
 nextcloud:17.0
 nextcloud:17.0-apache
 nextcloud:17.0-fpm
 nextcloud:17.0-fpm-alpine
+nextcloud:17.0-rc
+nextcloud:17.0-rc-apache
+nextcloud:17.0-rc-fpm
+nextcloud:17.0-rc-fpm-alpine
 nextcloud:17.0.9
 nextcloud:17.0.9-apache
 nextcloud:17.0.9-fpm
 nextcloud:17.0.9-fpm-alpine
+nextcloud:17.0.10RC1
+nextcloud:17.0.10RC1-apache
+nextcloud:17.0.10RC1-fpm
+nextcloud:17.0.10RC1-fpm-alpine
+nextcloud:17.0.10-rc
+nextcloud:17.0.10-rc-apache
+nextcloud:17.0.10-rc-fpm
+nextcloud:17.0.10-rc-fpm-alpine
 nextcloud:18
 nextcloud:18-apache
 nextcloud:18-fpm
 nextcloud:18-fpm-alpine
+nextcloud:18-rc
+nextcloud:18-rc-apache
+nextcloud:18-rc-fpm
+nextcloud:18-rc-fpm-alpine
 nextcloud:18.0
 nextcloud:18.0-apache
 nextcloud:18.0-fpm
 nextcloud:18.0-fpm-alpine
+nextcloud:18.0-rc
+nextcloud:18.0-rc-apache
+nextcloud:18.0-rc-fpm
+nextcloud:18.0-rc-fpm-alpine
 nextcloud:18.0.9
 nextcloud:18.0.9-apache
 nextcloud:18.0.9-fpm
 nextcloud:18.0.9-fpm-alpine
+nextcloud:18.0.10RC1
+nextcloud:18.0.10RC1-apache
+nextcloud:18.0.10RC1-fpm
+nextcloud:18.0.10RC1-fpm-alpine
+nextcloud:18.0.10-rc
+nextcloud:18.0.10-rc-apache
+nextcloud:18.0.10-rc-fpm
+nextcloud:18.0.10-rc-fpm-alpine
 nextcloud:19
 nextcloud:19-apache
 nextcloud:19-fpm
 nextcloud:19-fpm-alpine
+nextcloud:19-rc
+nextcloud:19-rc-apache
+nextcloud:19-rc-fpm
+nextcloud:19-rc-fpm-alpine
 nextcloud:19.0
 nextcloud:19.0-apache
 nextcloud:19.0-fpm
 nextcloud:19.0-fpm-alpine
+nextcloud:19.0-rc
+nextcloud:19.0-rc-apache
+nextcloud:19.0-rc-fpm
+nextcloud:19.0-rc-fpm-alpine
 nextcloud:19.0.3
 nextcloud:19.0.3-apache
 nextcloud:19.0.3-fpm
 nextcloud:19.0.3-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.0RC2
-nextcloud:20.0.0RC2-apache
-nextcloud:20.0.0RC2-fpm
-nextcloud:20.0.0RC2-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:19.0.4RC1
+nextcloud:19.0.4RC1-apache
+nextcloud:19.0.4RC1-fpm
+nextcloud:19.0.4RC1-fpm-alpine
+nextcloud:19.0.4-rc
+nextcloud:19.0.4-rc-apache
+nextcloud:19.0.4-rc-fpm
+nextcloud:19.0.4-rc-fpm-alpine
+nextcloud:20
+nextcloud:20-apache
+nextcloud:20-fpm
+nextcloud:20-fpm-alpine
+nextcloud:20.0
+nextcloud:20.0-apache
+nextcloud:20.0-fpm
+nextcloud:20.0-fpm-alpine
+nextcloud:20.0.0
+nextcloud:20.0.0-apache
+nextcloud:20.0.0-fpm
+nextcloud:20.0.0-fpm-alpine
 nextcloud:apache
 nextcloud:fpm
 nextcloud:fpm-alpine
diff --git a/nextcloud_20-rc-fpm-alpine/Dockerfile b/nextcloud_17-rc-fpm-alpine/Dockerfile
similarity index 94%
copy from nextcloud_20-rc-fpm-alpine/Dockerfile
copy to nextcloud_17-rc-fpm-alpine/Dockerfile
index f1acde5..b286945 100644
--- a/nextcloud_20-rc-fpm-alpine/Dockerfile
+++ b/nextcloud_17-rc-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.4-fpm-alpine3.12
+FROM php:7.3-fpm-alpine3.12
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -35,10 +35,9 @@ RUN set -ex; \
         gmp-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
-        bcmath \
         exif \
         gd \
         intl \
@@ -54,7 +53,7 @@ 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.18; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.1; \
+    pecl install redis-4.3.0; \
     pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
@@ -95,7 +94,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.0RC2
+ENV NEXTCLOUD_VERSION 17.0.10RC1
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_20-rc-fpm-alpine/config/apcu.config.php b/nextcloud_17-rc-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/config/apcu.config.php
rename to nextcloud_17-rc-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_20-rc-fpm-alpine/config/apps.config.php b/nextcloud_17-rc-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/config/apps.config.php
rename to nextcloud_17-rc-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_20-rc-fpm-alpine/config/autoconfig.php b/nextcloud_17-rc-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/config/autoconfig.php
rename to nextcloud_17-rc-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_20-rc-fpm-alpine/config/redis.config.php b/nextcloud_17-rc-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/config/redis.config.php
rename to nextcloud_17-rc-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_20-rc-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_17-rc-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_17-rc-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_20-rc-fpm-alpine/config/s3.config.php b/nextcloud_17-rc-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/config/s3.config.php
rename to nextcloud_17-rc-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_20-rc-fpm-alpine/config/smtp.config.php b/nextcloud_17-rc-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/config/smtp.config.php
rename to nextcloud_17-rc-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_20-rc-fpm-alpine/config/swift.config.php b/nextcloud_17-rc-fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/config/swift.config.php
rename to nextcloud_17-rc-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_20-rc-fpm-alpine/cron.sh b/nextcloud_17-rc-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/cron.sh
rename to nextcloud_17-rc-fpm-alpine/cron.sh
diff --git a/nextcloud_20-rc-fpm-alpine/entrypoint.sh b/nextcloud_17-rc-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/entrypoint.sh
rename to nextcloud_17-rc-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_20-rc-fpm-alpine/upgrade.exclude b/nextcloud_17-rc-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_20-rc-fpm-alpine/upgrade.exclude
rename to nextcloud_17-rc-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_18-fpm/Dockerfile b/nextcloud_17-rc-fpm/Dockerfile
similarity index 94%
copy from nextcloud_18-fpm/Dockerfile
copy to nextcloud_17-rc-fpm/Dockerfile
index 97f7b5f..c4daa50 100644
--- a/nextcloud_18-fpm/Dockerfile
+++ b/nextcloud_17-rc-fpm/Dockerfile
@@ -107,7 +107,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 18.0.9
+ENV NEXTCLOUD_VERSION 17.0.10RC1
 
 RUN set -ex; \
     fetchDeps=" \
@@ -118,9 +118,9 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
     curl -fsSL -o nextcloud.tar.bz2 \
-        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
+        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
     curl -fsSL -o nextcloud.tar.bz2.asc \
-        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
+        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_20-rc-fpm/config/apcu.config.php b/nextcloud_17-rc-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm/config/apcu.config.php
rename to nextcloud_17-rc-fpm/config/apcu.config.php
diff --git a/nextcloud_20-rc-fpm/config/apps.config.php b/nextcloud_17-rc-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm/config/apps.config.php
rename to nextcloud_17-rc-fpm/config/apps.config.php
diff --git a/nextcloud_20-rc-fpm/config/autoconfig.php b/nextcloud_17-rc-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_20-rc-fpm/config/autoconfig.php
rename to nextcloud_17-rc-fpm/config/autoconfig.php
diff --git a/nextcloud_20-rc-fpm/config/redis.config.php b/nextcloud_17-rc-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm/config/redis.config.php
rename to nextcloud_17-rc-fpm/config/redis.config.php
diff --git a/nextcloud_20-rc-fpm/config/reverse-proxy.config.php b/nextcloud_17-rc-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm/config/reverse-proxy.config.php
rename to nextcloud_17-rc-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_20-rc-fpm/config/s3.config.php b/nextcloud_17-rc-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm/config/s3.config.php
rename to nextcloud_17-rc-fpm/config/s3.config.php
diff --git a/nextcloud_20-rc-fpm/config/smtp.config.php b/nextcloud_17-rc-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm/config/smtp.config.php
rename to nextcloud_17-rc-fpm/config/smtp.config.php
diff --git a/nextcloud_20-rc-fpm/config/swift.config.php b/nextcloud_17-rc-fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_20-rc-fpm/config/swift.config.php
rename to nextcloud_17-rc-fpm/config/swift.config.php
diff --git a/nextcloud_20-rc-fpm/cron.sh b/nextcloud_17-rc-fpm/cron.sh
similarity index 100%
rename from nextcloud_20-rc-fpm/cron.sh
rename to nextcloud_17-rc-fpm/cron.sh
diff --git a/nextcloud_20-rc-fpm/entrypoint.sh b/nextcloud_17-rc-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_20-rc-fpm/entrypoint.sh
rename to nextcloud_17-rc-fpm/entrypoint.sh
diff --git a/nextcloud_20-rc-fpm/upgrade.exclude b/nextcloud_17-rc-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_20-rc-fpm/upgrade.exclude
rename to nextcloud_17-rc-fpm/upgrade.exclude
diff --git a/nextcloud_17/Dockerfile b/nextcloud_17-rc/Dockerfile
similarity index 95%
copy from nextcloud_17/Dockerfile
copy to nextcloud_17-rc/Dockerfile
index daf4d30..7f639ee 100644
--- a/nextcloud_17/Dockerfile
+++ b/nextcloud_17-rc/Dockerfile
@@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 17.0.9
+ENV NEXTCLOUD_VERSION 17.0.10RC1
 
 RUN set -ex; \
     fetchDeps=" \
@@ -126,9 +126,9 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
     curl -fsSL -o nextcloud.tar.bz2 \
-        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
+        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
     curl -fsSL -o nextcloud.tar.bz2.asc \
-        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
+        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_20-rc/config/apache-pretty-urls.config.php b/nextcloud_17-rc/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_20-rc/config/apache-pretty-urls.config.php
rename to nextcloud_17-rc/config/apache-pretty-urls.config.php
diff --git a/nextcloud_20-rc/config/apcu.config.php b/nextcloud_17-rc/config/apcu.config.php
similarity index 100%
rename from nextcloud_20-rc/config/apcu.config.php
rename to nextcloud_17-rc/config/apcu.config.php
diff --git a/nextcloud_20-rc/config/apps.config.php b/nextcloud_17-rc/config/apps.config.php
similarity index 100%
rename from nextcloud_20-rc/config/apps.config.php
rename to nextcloud_17-rc/config/apps.config.php
diff --git a/nextcloud_20-rc/config/autoconfig.php b/nextcloud_17-rc/config/autoconfig.php
similarity index 100%
rename from nextcloud_20-rc/config/autoconfig.php
rename to nextcloud_17-rc/config/autoconfig.php
diff --git a/nextcloud_20-rc/config/redis.config.php b/nextcloud_17-rc/config/redis.config.php
similarity index 100%
rename from nextcloud_20-rc/config/redis.config.php
rename to nextcloud_17-rc/config/redis.config.php
diff --git a/nextcloud_20-rc/config/reverse-proxy.config.php b/nextcloud_17-rc/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_20-rc/config/reverse-proxy.config.php
rename to nextcloud_17-rc/config/reverse-proxy.config.php
diff --git a/nextcloud_20-rc/config/s3.config.php b/nextcloud_17-rc/config/s3.config.php
similarity index 100%
rename from nextcloud_20-rc/config/s3.config.php
rename to nextcloud_17-rc/config/s3.config.php
diff --git a/nextcloud_20-rc/config/smtp.config.php b/nextcloud_17-rc/config/smtp.config.php
similarity index 100%
rename from nextcloud_20-rc/config/smtp.config.php
rename to nextcloud_17-rc/config/smtp.config.php
diff --git a/nextcloud_20-rc/config/swift.config.php b/nextcloud_17-rc/config/swift.config.php
similarity index 100%
rename from nextcloud_20-rc/config/swift.config.php
rename to nextcloud_17-rc/config/swift.config.php
diff --git a/nextcloud_20-rc/cron.sh b/nextcloud_17-rc/cron.sh
similarity index 100%
rename from nextcloud_20-rc/cron.sh
rename to nextcloud_17-rc/cron.sh
diff --git a/nextcloud_20-rc/entrypoint.sh b/nextcloud_17-rc/entrypoint.sh
similarity index 100%
rename from nextcloud_20-rc/entrypoint.sh
rename to nextcloud_17-rc/entrypoint.sh
diff --git a/nextcloud_20-rc/upgrade.exclude b/nextcloud_17-rc/upgrade.exclude
similarity index 100%
rename from nextcloud_20-rc/upgrade.exclude
rename to nextcloud_17-rc/upgrade.exclude
diff --git a/nextcloud_20-rc-fpm-alpine/Dockerfile b/nextcloud_18-rc-fpm-alpine/Dockerfile
similarity index 94%
copy from nextcloud_20-rc-fpm-alpine/Dockerfile
copy to nextcloud_18-rc-fpm-alpine/Dockerfile
index f1acde5..52d30d4 100644
--- a/nextcloud_20-rc-fpm-alpine/Dockerfile
+++ b/nextcloud_18-rc-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.4-fpm-alpine3.12
+FROM php:7.3-fpm-alpine3.12
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -35,10 +35,9 @@ RUN set -ex; \
         gmp-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
+    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
-        bcmath \
         exif \
         gd \
         intl \
@@ -54,7 +53,7 @@ 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.18; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.1; \
+    pecl install redis-4.3.0; \
     pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
@@ -95,7 +94,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.0RC2
+ENV NEXTCLOUD_VERSION 18.0.10RC1
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_18-rc-fpm-alpine/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_18-rc-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_18-rc-fpm-alpine/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_18-rc-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_18-rc-fpm-alpine/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_18-rc-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_18-rc-fpm-alpine/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_18-rc-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_18-rc-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_18-rc-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_18-rc-fpm-alpine/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_18-rc-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_18-rc-fpm-alpine/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_18-rc-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_18-rc-fpm-alpine/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_18-rc-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_18-rc-fpm-alpine/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_18-rc-fpm-alpine/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_18-rc-fpm-alpine/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_18-rc-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_18-rc-fpm-alpine/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_18-rc-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_18-fpm/Dockerfile b/nextcloud_18-rc-fpm/Dockerfile
similarity index 94%
copy from nextcloud_18-fpm/Dockerfile
copy to nextcloud_18-rc-fpm/Dockerfile
index 97f7b5f..7681735 100644
--- a/nextcloud_18-fpm/Dockerfile
+++ b/nextcloud_18-rc-fpm/Dockerfile
@@ -107,7 +107,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 18.0.9
+ENV NEXTCLOUD_VERSION 18.0.10RC1
 
 RUN set -ex; \
     fetchDeps=" \
@@ -118,9 +118,9 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
     curl -fsSL -o nextcloud.tar.bz2 \
-        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
+        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
     curl -fsSL -o nextcloud.tar.bz2.asc \
-        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
+        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_18-rc-fpm/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_18-rc-fpm/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_18-rc-fpm/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_18-rc-fpm/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_18-rc-fpm/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_18-rc-fpm/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_18-rc-fpm/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_18-rc-fpm/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_18-rc-fpm/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_18-rc-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_18-rc-fpm/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_18-rc-fpm/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_18-rc-fpm/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_18-rc-fpm/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_18-rc-fpm/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_18-rc-fpm/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_18-rc-fpm/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_18-rc-fpm/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_18-rc-fpm/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_18-rc-fpm/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_18-rc-fpm/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_18-rc-fpm/upgrade.exclude
diff --git a/nextcloud_17/Dockerfile b/nextcloud_18-rc/Dockerfile
similarity index 95%
copy from nextcloud_17/Dockerfile
copy to nextcloud_18-rc/Dockerfile
index daf4d30..76350cf 100644
--- a/nextcloud_17/Dockerfile
+++ b/nextcloud_18-rc/Dockerfile
@@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 17.0.9
+ENV NEXTCLOUD_VERSION 18.0.10RC1
 
 RUN set -ex; \
     fetchDeps=" \
@@ -126,9 +126,9 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
     curl -fsSL -o nextcloud.tar.bz2 \
-        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
+        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
     curl -fsSL -o nextcloud.tar.bz2.asc \
-        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
+        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_17/config/apache-pretty-urls.config.php b/nextcloud_18-rc/config/apache-pretty-urls.config.php
similarity index 100%
copy from nextcloud_17/config/apache-pretty-urls.config.php
copy to nextcloud_18-rc/config/apache-pretty-urls.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_18-rc/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_18-rc/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_18-rc/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_18-rc/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_18-rc/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_18-rc/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_18-rc/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_18-rc/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_18-rc/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_18-rc/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_18-rc/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_18-rc/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_18-rc/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_18-rc/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_18-rc/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_18-rc/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_18-rc/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_18-rc/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_18-rc/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_18-rc/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_18-rc/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_18-rc/upgrade.exclude
diff --git a/nextcloud_20-rc-fpm-alpine/Dockerfile b/nextcloud_19-rc-fpm-alpine/Dockerfile
similarity index 99%
rename from nextcloud_20-rc-fpm-alpine/Dockerfile
rename to nextcloud_19-rc-fpm-alpine/Dockerfile
index f1acde5..19790f9 100644
--- a/nextcloud_20-rc-fpm-alpine/Dockerfile
+++ b/nextcloud_19-rc-fpm-alpine/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.0RC2
+ENV NEXTCLOUD_VERSION 19.0.4RC1
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_19-rc-fpm-alpine/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_19-rc-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_19-rc-fpm-alpine/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_19-rc-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_19-rc-fpm-alpine/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_19-rc-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_19-rc-fpm-alpine/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_19-rc-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_19-rc-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_19-rc-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_19-rc-fpm-alpine/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_19-rc-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_19-rc-fpm-alpine/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_19-rc-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_19-rc-fpm-alpine/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_19-rc-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_19-rc-fpm-alpine/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_19-rc-fpm-alpine/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_19-rc-fpm-alpine/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_19-rc-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_19-rc-fpm-alpine/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_19-rc-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_20-rc-fpm/Dockerfile b/nextcloud_19-rc-fpm/Dockerfile
similarity index 99%
rename from nextcloud_20-rc-fpm/Dockerfile
rename to nextcloud_19-rc-fpm/Dockerfile
index 925f5ca..c2ced08 100644
--- a/nextcloud_20-rc-fpm/Dockerfile
+++ b/nextcloud_19-rc-fpm/Dockerfile
@@ -106,7 +106,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.0RC2
+ENV NEXTCLOUD_VERSION 19.0.4RC1
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_19-rc-fpm/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_19-rc-fpm/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_19-rc-fpm/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_19-rc-fpm/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_19-rc-fpm/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_19-rc-fpm/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_19-rc-fpm/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_19-rc-fpm/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_19-rc-fpm/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_19-rc-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_19-rc-fpm/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_19-rc-fpm/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_19-rc-fpm/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_19-rc-fpm/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_19-rc-fpm/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_19-rc-fpm/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_19-rc-fpm/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_19-rc-fpm/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_19-rc-fpm/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_19-rc-fpm/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_19-rc-fpm/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_19-rc-fpm/upgrade.exclude
diff --git a/nextcloud_20-rc/Dockerfile b/nextcloud_19-rc/Dockerfile
similarity index 99%
rename from nextcloud_20-rc/Dockerfile
rename to nextcloud_19-rc/Dockerfile
index 9590fe0..cca65d8 100644
--- a/nextcloud_20-rc/Dockerfile
+++ b/nextcloud_19-rc/Dockerfile
@@ -114,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 20.0.0RC2
+ENV NEXTCLOUD_VERSION 19.0.4RC1
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_17/config/apache-pretty-urls.config.php b/nextcloud_19-rc/config/apache-pretty-urls.config.php
similarity index 100%
copy from nextcloud_17/config/apache-pretty-urls.config.php
copy to nextcloud_19-rc/config/apache-pretty-urls.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_19-rc/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_19-rc/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_19-rc/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_19-rc/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_19-rc/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_19-rc/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_19-rc/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_19-rc/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_19-rc/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_19-rc/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_19-rc/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_19-rc/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_19-rc/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_19-rc/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_19-rc/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_19-rc/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_19-rc/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_19-rc/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_19-rc/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_19-rc/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_19-rc/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_19-rc/upgrade.exclude
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
similarity index 99%
copy from nextcloud_production-fpm-alpine/Dockerfile
copy to nextcloud_fpm-alpine/Dockerfile
index 55a0b20..6e549d4 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 19.0.3
+ENV NEXTCLOUD_VERSION 20.0.0
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_fpm-alpine/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_fpm-alpine/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_fpm-alpine/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_fpm-alpine/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_fpm-alpine/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_fpm-alpine/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_fpm-alpine/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_fpm-alpine/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_fpm-alpine/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_fpm-alpine/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_fpm-alpine/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_fpm-alpine/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_fpm-alpine/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_fpm-alpine/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_fpm-alpine/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_fpm-alpine/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_fpm-alpine/upgrade.exclude
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_fpm/Dockerfile
similarity index 99%
copy from nextcloud_production-fpm/Dockerfile
copy to nextcloud_fpm/Dockerfile
index 66027f1..ab9553e 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_fpm/Dockerfile
@@ -106,7 +106,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 19.0.3
+ENV NEXTCLOUD_VERSION 20.0.0
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_fpm/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_fpm/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_fpm/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_fpm/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_fpm/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_fpm/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_fpm/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_fpm/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_fpm/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_fpm/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_fpm/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_fpm/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_fpm/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_fpm/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_fpm/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_fpm/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_fpm/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_fpm/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_fpm/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_fpm/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_fpm/upgrade.exclude
diff --git a/nextcloud_production/Dockerfile b/nextcloud_latest/Dockerfile
similarity index 99%
copy from nextcloud_production/Dockerfile
copy to nextcloud_latest/Dockerfile
index c77835a..8dc9e25 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_latest/Dockerfile
@@ -114,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 19.0.3
+ENV NEXTCLOUD_VERSION 20.0.0
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_17/config/apache-pretty-urls.config.php b/nextcloud_latest/config/apache-pretty-urls.config.php
similarity index 100%
copy from nextcloud_17/config/apache-pretty-urls.config.php
copy to nextcloud_latest/config/apache-pretty-urls.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_latest/config/apcu.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apcu.config.php
copy to nextcloud_latest/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_latest/config/apps.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/apps.config.php
copy to nextcloud_latest/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_latest/config/autoconfig.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/autoconfig.php
copy to nextcloud_latest/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_latest/config/redis.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/redis.config.php
copy to nextcloud_latest/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_latest/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_latest/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/s3.config.php b/nextcloud_latest/config/s3.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/s3.config.php
copy to nextcloud_latest/config/s3.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_latest/config/smtp.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/smtp.config.php
copy to nextcloud_latest/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/config/swift.config.php b/nextcloud_latest/config/swift.config.php
similarity index 100%
copy from nextcloud_17-fpm-alpine/config/swift.config.php
copy to nextcloud_latest/config/swift.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_latest/cron.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/cron.sh
copy to nextcloud_latest/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_latest/entrypoint.sh
similarity index 100%
copy from nextcloud_17-fpm-alpine/entrypoint.sh
copy to nextcloud_latest/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_latest/upgrade.exclude
similarity index 100%
copy from nextcloud_17-fpm-alpine/upgrade.exclude
copy to nextcloud_latest/upgrade.exclude

@yosifkit
Copy link
Member

yosifkit commented Oct 5, 2020

LGTM, just the regular test fasilures:

testing nextcloud:18.0.10RC1-apache
	'nextcloud-apache-run' [8/8]...failed

@yosifkit yosifkit merged commit 5bb39e6 into docker-library:master Oct 5, 2020
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