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.

Sign up for GitHub

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

Jump to bottom

Update Nextcloud #9427

Merged
merged 1 commit into from
Jan 15, 2021
Merged

Update Nextcloud #9427

merged 1 commit into from
Jan 15, 2021

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Jan 14, 2021

No description provided.

@github-actions
Copy link

Diff for b3705c7: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 281033d..3cc9ad1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,92 +1,62 @@
 Maintainers: Nextcloud <docker@nextcloud.com> (@nextcloud)
 GitRepo: https://github.com/nextcloud/docker.git
 
-Tags: 18.0.12-apache, 18.0-apache, 18-apache, 18.0.12, 18.0, 18
+Tags: 18.0.13-apache, 18.0-apache, 18-apache, 18.0.13, 18.0, 18
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 18.0/apache
 
-Tags: 18.0.12-fpm, 18.0-fpm, 18-fpm
+Tags: 18.0.13-fpm, 18.0-fpm, 18-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 18.0/fpm
 
-Tags: 18.0.12-fpm-alpine, 18.0-fpm-alpine, 18-fpm-alpine
+Tags: 18.0.13-fpm-alpine, 18.0-fpm-alpine, 18-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 18.0/fpm-alpine
 
-Tags: 18.0.13RC1-apache, 18.0.13-rc-apache, 18.0-rc-apache, 18-rc-apache, 18.0.13RC1, 18.0.13-rc, 18.0-rc, 18-rc
+Tags: 19.0.7-apache, 19.0-apache, 19-apache, 19.0.7, 19.0, 19
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 12747113eac11046eb65ec7c907983994213723b
-Directory: 18.0-rc/apache
-
-Tags: 18.0.13RC1-fpm, 18.0.13-rc-fpm, 18.0-rc-fpm, 18-rc-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 12747113eac11046eb65ec7c907983994213723b
-Directory: 18.0-rc/fpm
-
-Tags: 18.0.13RC1-fpm-alpine, 18.0.13-rc-fpm-alpine, 18.0-rc-fpm-alpine, 18-rc-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 12747113eac11046eb65ec7c907983994213723b
-Directory: 18.0-rc/fpm-alpine
-
-Tags: 19.0.6-apache, 19.0-apache, 19-apache, 19.0.6, 19.0, 19
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 19.0/apache
 
-Tags: 19.0.6-fpm, 19.0-fpm, 19-fpm
+Tags: 19.0.7-fpm, 19.0-fpm, 19-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 19.0/fpm
 
-Tags: 19.0.6-fpm-alpine, 19.0-fpm-alpine, 19-fpm-alpine
+Tags: 19.0.7-fpm-alpine, 19.0-fpm-alpine, 19-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 19.0/fpm-alpine
 
-Tags: 19.0.7RC1-apache, 19.0.7-rc-apache, 19.0-rc-apache, 19-rc-apache, 19.0.7RC1, 19.0.7-rc, 19.0-rc, 19-rc
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 12747113eac11046eb65ec7c907983994213723b
-Directory: 19.0-rc/apache
-
-Tags: 19.0.7RC1-fpm, 19.0.7-rc-fpm, 19.0-rc-fpm, 19-rc-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 12747113eac11046eb65ec7c907983994213723b
-Directory: 19.0-rc/fpm
-
-Tags: 19.0.7RC1-fpm-alpine, 19.0.7-rc-fpm-alpine, 19.0-rc-fpm-alpine, 19-rc-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 12747113eac11046eb65ec7c907983994213723b
-Directory: 19.0-rc/fpm-alpine
-
-Tags: 20.0.4-apache, 20.0-apache, 20-apache, apache, stable-apache, production-apache, 20.0.4, 20.0, 20, latest, stable, production
+Tags: 20.0.5-apache, 20.0-apache, 20-apache, apache, stable-apache, production-apache, 20.0.5, 20.0, 20, latest, stable, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 20.0/apache
 
-Tags: 20.0.4-fpm, 20.0-fpm, 20-fpm, fpm, stable-fpm, production-fpm
+Tags: 20.0.5-fpm, 20.0-fpm, 20-fpm, fpm, stable-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 20.0/fpm
 
-Tags: 20.0.4-fpm-alpine, 20.0-fpm-alpine, 20-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 20.0.5-fpm-alpine, 20.0-fpm-alpine, 20-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b23910be9215f8338aee419007feb70cdacb7741
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 20.0/fpm-alpine
 
-Tags: 21.0.0beta4-apache, 21.0.0-beta-apache, 21.0-beta-apache, 21-beta-apache, 21.0.0beta4, 21.0.0-beta, 21.0-beta, 21-beta
+Tags: 21.0.0beta6-apache, 21.0.0-beta-apache, 21.0-beta-apache, 21-beta-apache, 21.0.0beta6, 21.0.0-beta, 21.0-beta, 21-beta
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e5b568e52f0facf73515c0a7eb749bb2c8e2c4d0
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 21.0-beta/apache
 
-Tags: 21.0.0beta4-fpm, 21.0.0-beta-fpm, 21.0-beta-fpm, 21-beta-fpm
+Tags: 21.0.0beta6-fpm, 21.0.0-beta-fpm, 21.0-beta-fpm, 21-beta-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e5b568e52f0facf73515c0a7eb749bb2c8e2c4d0
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 21.0-beta/fpm
 
-Tags: 21.0.0beta4-fpm-alpine, 21.0.0-beta-fpm-alpine, 21.0-beta-fpm-alpine, 21-beta-fpm-alpine
+Tags: 21.0.0beta6-fpm-alpine, 21.0.0-beta-fpm-alpine, 21.0-beta-fpm-alpine, 21-beta-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e5b568e52f0facf73515c0a7eb749bb2c8e2c4d0
+GitCommit: aa48d5145f8b9d2774bf747077e1f00fb64b47e4
 Directory: 21.0-beta/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 2be35ee..c6e4541 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,58 +2,26 @@ 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.12
-nextcloud:18.0.12-apache
-nextcloud:18.0.12-fpm
-nextcloud:18.0.12-fpm-alpine
-nextcloud:18.0.13RC1
-nextcloud:18.0.13RC1-apache
-nextcloud:18.0.13RC1-fpm
-nextcloud:18.0.13RC1-fpm-alpine
-nextcloud:18.0.13-rc
-nextcloud:18.0.13-rc-apache
-nextcloud:18.0.13-rc-fpm
-nextcloud:18.0.13-rc-fpm-alpine
+nextcloud:18.0.13
+nextcloud:18.0.13-apache
+nextcloud:18.0.13-fpm
+nextcloud:18.0.13-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.6
-nextcloud:19.0.6-apache
-nextcloud:19.0.6-fpm
-nextcloud:19.0.6-fpm-alpine
-nextcloud:19.0.7RC1
-nextcloud:19.0.7RC1-apache
-nextcloud:19.0.7RC1-fpm
-nextcloud:19.0.7RC1-fpm-alpine
-nextcloud:19.0.7-rc
-nextcloud:19.0.7-rc-apache
-nextcloud:19.0.7-rc-fpm
-nextcloud:19.0.7-rc-fpm-alpine
+nextcloud:19.0.7
+nextcloud:19.0.7-apache
+nextcloud:19.0.7-fpm
+nextcloud:19.0.7-fpm-alpine
 nextcloud:20
 nextcloud:20-apache
 nextcloud:20-fpm
@@ -62,10 +30,10 @@ nextcloud:20.0
 nextcloud:20.0-apache
 nextcloud:20.0-fpm
 nextcloud:20.0-fpm-alpine
-nextcloud:20.0.4
-nextcloud:20.0.4-apache
-nextcloud:20.0.4-fpm
-nextcloud:20.0.4-fpm-alpine
+nextcloud:20.0.5
+nextcloud:20.0.5-apache
+nextcloud:20.0.5-fpm
+nextcloud:20.0.5-fpm-alpine
 nextcloud:21-beta
 nextcloud:21-beta-apache
 nextcloud:21-beta-fpm
@@ -74,10 +42,10 @@ nextcloud:21.0-beta
 nextcloud:21.0-beta-apache
 nextcloud:21.0-beta-fpm
 nextcloud:21.0-beta-fpm-alpine
-nextcloud:21.0.0beta4
-nextcloud:21.0.0beta4-apache
-nextcloud:21.0.0beta4-fpm
-nextcloud:21.0.0beta4-fpm-alpine
+nextcloud:21.0.0beta6
+nextcloud:21.0.0beta6-apache
+nextcloud:21.0.0beta6-fpm
+nextcloud:21.0.0beta6-fpm-alpine
 nextcloud:21.0.0-beta
 nextcloud:21.0.0-beta-apache
 nextcloud:21.0.0-beta-fpm
diff --git a/nextcloud_18-fpm-alpine/Dockerfile b/nextcloud_18-fpm-alpine/Dockerfile
index e4dadfe..654994e 100644
--- a/nextcloud_18-fpm-alpine/Dockerfile
+++ b/nextcloud_18-fpm-alpine/Dockerfile
@@ -94,7 +94,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 18.0.12
+ENV NEXTCLOUD_VERSION 18.0.13
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_18-fpm-alpine/config/apps.config.php b/nextcloud_18-fpm-alpine/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_18-fpm-alpine/config/apps.config.php
+++ b/nextcloud_18-fpm-alpine/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_18-fpm-alpine/config/autoconfig.php b/nextcloud_18-fpm-alpine/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_18-fpm-alpine/config/autoconfig.php
+++ b/nextcloud_18-fpm-alpine/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_18-fpm/Dockerfile b/nextcloud_18-fpm/Dockerfile
index 973699e..9157a8c 100644
--- a/nextcloud_18-fpm/Dockerfile
+++ b/nextcloud_18-fpm/Dockerfile
@@ -107,7 +107,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 18.0.12
+ENV NEXTCLOUD_VERSION 18.0.13
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_18-fpm/config/apps.config.php b/nextcloud_18-fpm/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_18-fpm/config/apps.config.php
+++ b/nextcloud_18-fpm/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_18-fpm/config/autoconfig.php b/nextcloud_18-fpm/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_18-fpm/config/autoconfig.php
+++ b/nextcloud_18-fpm/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_18-rc-fpm-alpine/Dockerfile b/nextcloud_18-rc-fpm-alpine/Dockerfile
deleted file mode 100644
index e98be1e..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/config/apcu.config.php b/nextcloud_18-rc-fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/config/apps.config.php b/nextcloud_18-rc-fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/config/autoconfig.php b/nextcloud_18-rc-fpm-alpine/config/autoconfig.php
deleted file mode 100644
index 5bb85d4..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/config/redis.config.php b/nextcloud_18-rc-fpm-alpine/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_18-rc-fpm-alpine/config/reverse-proxy.config.php
deleted file mode 100644
index 667be31..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/config/s3.config.php b/nextcloud_18-rc-fpm-alpine/config/s3.config.php
deleted file mode 100644
index 6376d8f..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/config/smtp.config.php b/nextcloud_18-rc-fpm-alpine/config/smtp.config.php
deleted file mode 100644
index 59f1eaa..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/config/swift.config.php b/nextcloud_18-rc-fpm-alpine/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/cron.sh b/nextcloud_18-rc-fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/entrypoint.sh b/nextcloud_18-rc-fpm-alpine/entrypoint.sh
deleted file mode 100755
index bee572c..0000000
diff --git a/nextcloud_18-rc-fpm-alpine/upgrade.exclude b/nextcloud_18-rc-fpm-alpine/upgrade.exclude
deleted file mode 100644
index 354864d..0000000
diff --git a/nextcloud_18-rc-fpm/Dockerfile b/nextcloud_18-rc-fpm/Dockerfile
deleted file mode 100644
index b559e1e..0000000
diff --git a/nextcloud_18-rc-fpm/config/apcu.config.php b/nextcloud_18-rc-fpm/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_18-rc-fpm/config/apps.config.php b/nextcloud_18-rc-fpm/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_18-rc-fpm/config/autoconfig.php b/nextcloud_18-rc-fpm/config/autoconfig.php
deleted file mode 100644
index 5bb85d4..0000000
diff --git a/nextcloud_18-rc-fpm/config/redis.config.php b/nextcloud_18-rc-fpm/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
diff --git a/nextcloud_18-rc-fpm/config/reverse-proxy.config.php b/nextcloud_18-rc-fpm/config/reverse-proxy.config.php
deleted file mode 100644
index 667be31..0000000
diff --git a/nextcloud_18-rc-fpm/config/s3.config.php b/nextcloud_18-rc-fpm/config/s3.config.php
deleted file mode 100644
index 6376d8f..0000000
diff --git a/nextcloud_18-rc-fpm/config/smtp.config.php b/nextcloud_18-rc-fpm/config/smtp.config.php
deleted file mode 100644
index 59f1eaa..0000000
diff --git a/nextcloud_18-rc-fpm/config/swift.config.php b/nextcloud_18-rc-fpm/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
diff --git a/nextcloud_18-rc-fpm/cron.sh b/nextcloud_18-rc-fpm/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_18-rc-fpm/entrypoint.sh b/nextcloud_18-rc-fpm/entrypoint.sh
deleted file mode 100755
index bee572c..0000000
diff --git a/nextcloud_18-rc-fpm/upgrade.exclude b/nextcloud_18-rc-fpm/upgrade.exclude
deleted file mode 100644
index 354864d..0000000
diff --git a/nextcloud_18-rc/Dockerfile b/nextcloud_18-rc/Dockerfile
deleted file mode 100644
index 525c16a..0000000
diff --git a/nextcloud_18-rc/config/apache-pretty-urls.config.php b/nextcloud_18-rc/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8..0000000
diff --git a/nextcloud_18-rc/config/apcu.config.php b/nextcloud_18-rc/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_18-rc/config/apps.config.php b/nextcloud_18-rc/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_18-rc/config/autoconfig.php b/nextcloud_18-rc/config/autoconfig.php
deleted file mode 100644
index 5bb85d4..0000000
diff --git a/nextcloud_18-rc/config/redis.config.php b/nextcloud_18-rc/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
diff --git a/nextcloud_18-rc/config/reverse-proxy.config.php b/nextcloud_18-rc/config/reverse-proxy.config.php
deleted file mode 100644
index 667be31..0000000
diff --git a/nextcloud_18-rc/config/s3.config.php b/nextcloud_18-rc/config/s3.config.php
deleted file mode 100644
index 6376d8f..0000000
diff --git a/nextcloud_18-rc/config/smtp.config.php b/nextcloud_18-rc/config/smtp.config.php
deleted file mode 100644
index 59f1eaa..0000000
diff --git a/nextcloud_18-rc/config/swift.config.php b/nextcloud_18-rc/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
diff --git a/nextcloud_18-rc/cron.sh b/nextcloud_18-rc/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_18-rc/entrypoint.sh b/nextcloud_18-rc/entrypoint.sh
deleted file mode 100755
index bee572c..0000000
diff --git a/nextcloud_18-rc/upgrade.exclude b/nextcloud_18-rc/upgrade.exclude
deleted file mode 100644
index 354864d..0000000
diff --git a/nextcloud_18/Dockerfile b/nextcloud_18/Dockerfile
index 6529988..59232c6 100644
--- a/nextcloud_18/Dockerfile
+++ b/nextcloud_18/Dockerfile
@@ -115,7 +115,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 18.0.12
+ENV NEXTCLOUD_VERSION 18.0.13
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_18/config/apps.config.php b/nextcloud_18/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_18/config/apps.config.php
+++ b/nextcloud_18/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_18/config/autoconfig.php b/nextcloud_18/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_18/config/autoconfig.php
+++ b/nextcloud_18/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_19-fpm-alpine/Dockerfile b/nextcloud_19-fpm-alpine/Dockerfile
index 533a548..badd662 100644
--- a/nextcloud_19-fpm-alpine/Dockerfile
+++ b/nextcloud_19-fpm-alpine/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 19.0.6
+ENV NEXTCLOUD_VERSION 19.0.7
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_19-fpm-alpine/config/apps.config.php b/nextcloud_19-fpm-alpine/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_19-fpm-alpine/config/apps.config.php
+++ b/nextcloud_19-fpm-alpine/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_19-fpm-alpine/config/autoconfig.php b/nextcloud_19-fpm-alpine/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_19-fpm-alpine/config/autoconfig.php
+++ b/nextcloud_19-fpm-alpine/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_19-fpm/Dockerfile b/nextcloud_19-fpm/Dockerfile
index d7a154c..d6e7fae 100644
--- a/nextcloud_19-fpm/Dockerfile
+++ b/nextcloud_19-fpm/Dockerfile
@@ -106,7 +106,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 19.0.6
+ENV NEXTCLOUD_VERSION 19.0.7
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_19-fpm/config/apps.config.php b/nextcloud_19-fpm/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_19-fpm/config/apps.config.php
+++ b/nextcloud_19-fpm/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_19-fpm/config/autoconfig.php b/nextcloud_19-fpm/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_19-fpm/config/autoconfig.php
+++ b/nextcloud_19-fpm/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_19-rc-fpm-alpine/Dockerfile b/nextcloud_19-rc-fpm-alpine/Dockerfile
deleted file mode 100644
index 93a97d7..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/config/apcu.config.php b/nextcloud_19-rc-fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/config/apps.config.php b/nextcloud_19-rc-fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/config/autoconfig.php b/nextcloud_19-rc-fpm-alpine/config/autoconfig.php
deleted file mode 100644
index 5bb85d4..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/config/redis.config.php b/nextcloud_19-rc-fpm-alpine/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_19-rc-fpm-alpine/config/reverse-proxy.config.php
deleted file mode 100644
index 667be31..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/config/s3.config.php b/nextcloud_19-rc-fpm-alpine/config/s3.config.php
deleted file mode 100644
index 6376d8f..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/config/smtp.config.php b/nextcloud_19-rc-fpm-alpine/config/smtp.config.php
deleted file mode 100644
index 59f1eaa..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/config/swift.config.php b/nextcloud_19-rc-fpm-alpine/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/cron.sh b/nextcloud_19-rc-fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/entrypoint.sh b/nextcloud_19-rc-fpm-alpine/entrypoint.sh
deleted file mode 100755
index bee572c..0000000
diff --git a/nextcloud_19-rc-fpm-alpine/upgrade.exclude b/nextcloud_19-rc-fpm-alpine/upgrade.exclude
deleted file mode 100644
index 354864d..0000000
diff --git a/nextcloud_19-rc-fpm/Dockerfile b/nextcloud_19-rc-fpm/Dockerfile
deleted file mode 100644
index c9f0e5b..0000000
diff --git a/nextcloud_19-rc-fpm/config/apcu.config.php b/nextcloud_19-rc-fpm/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_19-rc-fpm/config/apps.config.php b/nextcloud_19-rc-fpm/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_19-rc-fpm/config/autoconfig.php b/nextcloud_19-rc-fpm/config/autoconfig.php
deleted file mode 100644
index 5bb85d4..0000000
diff --git a/nextcloud_19-rc-fpm/config/redis.config.php b/nextcloud_19-rc-fpm/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
diff --git a/nextcloud_19-rc-fpm/config/reverse-proxy.config.php b/nextcloud_19-rc-fpm/config/reverse-proxy.config.php
deleted file mode 100644
index 667be31..0000000
diff --git a/nextcloud_19-rc-fpm/config/s3.config.php b/nextcloud_19-rc-fpm/config/s3.config.php
deleted file mode 100644
index 6376d8f..0000000
diff --git a/nextcloud_19-rc-fpm/config/smtp.config.php b/nextcloud_19-rc-fpm/config/smtp.config.php
deleted file mode 100644
index 59f1eaa..0000000
diff --git a/nextcloud_19-rc-fpm/config/swift.config.php b/nextcloud_19-rc-fpm/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
diff --git a/nextcloud_19-rc-fpm/cron.sh b/nextcloud_19-rc-fpm/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_19-rc-fpm/entrypoint.sh b/nextcloud_19-rc-fpm/entrypoint.sh
deleted file mode 100755
index bee572c..0000000
diff --git a/nextcloud_19-rc-fpm/upgrade.exclude b/nextcloud_19-rc-fpm/upgrade.exclude
deleted file mode 100644
index 354864d..0000000
diff --git a/nextcloud_19-rc/Dockerfile b/nextcloud_19-rc/Dockerfile
deleted file mode 100644
index ec166f9..0000000
diff --git a/nextcloud_19-rc/config/apache-pretty-urls.config.php b/nextcloud_19-rc/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8..0000000
diff --git a/nextcloud_19-rc/config/apcu.config.php b/nextcloud_19-rc/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_19-rc/config/apps.config.php b/nextcloud_19-rc/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_19-rc/config/autoconfig.php b/nextcloud_19-rc/config/autoconfig.php
deleted file mode 100644
index 5bb85d4..0000000
diff --git a/nextcloud_19-rc/config/redis.config.php b/nextcloud_19-rc/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
diff --git a/nextcloud_19-rc/config/reverse-proxy.config.php b/nextcloud_19-rc/config/reverse-proxy.config.php
deleted file mode 100644
index 667be31..0000000
diff --git a/nextcloud_19-rc/config/s3.config.php b/nextcloud_19-rc/config/s3.config.php
deleted file mode 100644
index 6376d8f..0000000
diff --git a/nextcloud_19-rc/config/smtp.config.php b/nextcloud_19-rc/config/smtp.config.php
deleted file mode 100644
index 59f1eaa..0000000
diff --git a/nextcloud_19-rc/config/swift.config.php b/nextcloud_19-rc/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
diff --git a/nextcloud_19-rc/cron.sh b/nextcloud_19-rc/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_19-rc/entrypoint.sh b/nextcloud_19-rc/entrypoint.sh
deleted file mode 100755
index bee572c..0000000
diff --git a/nextcloud_19-rc/upgrade.exclude b/nextcloud_19-rc/upgrade.exclude
deleted file mode 100644
index 354864d..0000000
diff --git a/nextcloud_19/Dockerfile b/nextcloud_19/Dockerfile
index 9e21f73..16f7b4c 100644
--- a/nextcloud_19/Dockerfile
+++ b/nextcloud_19/Dockerfile
@@ -114,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 19.0.6
+ENV NEXTCLOUD_VERSION 19.0.7
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_19/config/apps.config.php b/nextcloud_19/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_19/config/apps.config.php
+++ b/nextcloud_19/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_19/config/autoconfig.php b/nextcloud_19/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_19/config/autoconfig.php
+++ b/nextcloud_19/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_21-beta-fpm-alpine/Dockerfile b/nextcloud_21-beta-fpm-alpine/Dockerfile
index 119b6dc..f06c641 100644
--- a/nextcloud_21-beta-fpm-alpine/Dockerfile
+++ b/nextcloud_21-beta-fpm-alpine/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.0beta4
+ENV NEXTCLOUD_VERSION 21.0.0beta6
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_21-beta-fpm-alpine/config/apps.config.php b/nextcloud_21-beta-fpm-alpine/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_21-beta-fpm-alpine/config/apps.config.php
+++ b/nextcloud_21-beta-fpm-alpine/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_21-beta-fpm-alpine/config/autoconfig.php b/nextcloud_21-beta-fpm-alpine/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_21-beta-fpm-alpine/config/autoconfig.php
+++ b/nextcloud_21-beta-fpm-alpine/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_21-beta-fpm/Dockerfile b/nextcloud_21-beta-fpm/Dockerfile
index 62eb0e2..bcfa410 100644
--- a/nextcloud_21-beta-fpm/Dockerfile
+++ b/nextcloud_21-beta-fpm/Dockerfile
@@ -106,7 +106,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.0beta4
+ENV NEXTCLOUD_VERSION 21.0.0beta6
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_21-beta-fpm/config/apps.config.php b/nextcloud_21-beta-fpm/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_21-beta-fpm/config/apps.config.php
+++ b/nextcloud_21-beta-fpm/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_21-beta-fpm/config/autoconfig.php b/nextcloud_21-beta-fpm/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_21-beta-fpm/config/autoconfig.php
+++ b/nextcloud_21-beta-fpm/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_21-beta/Dockerfile b/nextcloud_21-beta/Dockerfile
index 65c59a1..7936c6d 100644
--- a/nextcloud_21-beta/Dockerfile
+++ b/nextcloud_21-beta/Dockerfile
@@ -114,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 21.0.0beta4
+ENV NEXTCLOUD_VERSION 21.0.0beta6
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_21-beta/config/apps.config.php b/nextcloud_21-beta/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_21-beta/config/apps.config.php
+++ b/nextcloud_21-beta/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_21-beta/config/autoconfig.php b/nextcloud_21-beta/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_21-beta/config/autoconfig.php
+++ b/nextcloud_21-beta/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index 8308e07..764b1c6 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.4
+ENV NEXTCLOUD_VERSION 20.0.5
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_production-fpm-alpine/config/apps.config.php b/nextcloud_production-fpm-alpine/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_production-fpm-alpine/config/apps.config.php
+++ b/nextcloud_production-fpm-alpine/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_production-fpm-alpine/config/autoconfig.php b/nextcloud_production-fpm-alpine/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_production-fpm-alpine/config/autoconfig.php
+++ b/nextcloud_production-fpm-alpine/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 9c69a39..f56cb5c 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -106,7 +106,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.4
+ENV NEXTCLOUD_VERSION 20.0.5
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production-fpm/config/apps.config.php b/nextcloud_production-fpm/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_production-fpm/config/apps.config.php
+++ b/nextcloud_production-fpm/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_production-fpm/config/autoconfig.php b/nextcloud_production-fpm/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_production-fpm/config/autoconfig.php
+++ b/nextcloud_production-fpm/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index 019a4ef..4a91b65 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/Dockerfile
@@ -114,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 20.0.4
+ENV NEXTCLOUD_VERSION 20.0.5
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production/config/apps.config.php b/nextcloud_production/config/apps.config.php
index a4bed83..4c37f72 100644
--- a/nextcloud_production/config/apps.config.php
+++ b/nextcloud_production/config/apps.config.php
@@ -1,15 +1,15 @@
 <?php
 $CONFIG = array (
-  "apps_paths" => array (
+  'apps_paths' => array (
       0 => array (
-              "path"     => OC::$SERVERROOT."/apps",
-              "url"      => "/apps",
-              "writable" => false,
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
       ),
       1 => array (
-              "path"     => OC::$SERVERROOT."/custom_apps",
-              "url"      => "/custom_apps",
-              "writable" => true,
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
       ),
   ),
 );
diff --git a/nextcloud_production/config/autoconfig.php b/nextcloud_production/config/autoconfig.php
index 5bb85d4..f01f18d 100644
--- a/nextcloud_production/config/autoconfig.php
+++ b/nextcloud_production/config/autoconfig.php
@@ -3,25 +3,25 @@
 $autoconfig_enabled = false;
 
 if (getenv('SQLITE_DATABASE')) {
-    $AUTOCONFIG["dbtype"] = "sqlite";
-    $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
+    $AUTOCONFIG['dbtype'] = 'sqlite';
+    $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
     $autoconfig_enabled = true;
 } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-    $AUTOCONFIG["dbtype"] = "mysql";
-    $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-    $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-    $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
+    $AUTOCONFIG['dbtype'] = 'mysql';
+    $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
+    $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
+    $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
     $autoconfig_enabled = true;
 } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-    $AUTOCONFIG["dbtype"] = "pgsql";
-    $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-    $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-    $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-    $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
+    $AUTOCONFIG['dbtype'] = 'pgsql';
+    $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
+    $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
+    $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
+    $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
     $autoconfig_enabled = true;
 }
 
 if ($autoconfig_enabled) {
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
+    $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
 }

@J0WI
Copy link
Contributor Author

J0WI commented Jan 14, 2021

I really need to investigate those flaky tests... 😞

@yosifkit
Copy link
Member

❤️ I always love changes that are fixing unnecessarily double-quoted strings.

Just the regular flaky tests:

testing nextcloud:18.0.13-apache
	'nextcloud-cli-mysql' [5/8]...failed
testing nextcloud:19.0.7-apache
	'nextcloud-cli-postgres' [6/8]...failed
testing nextcloud:20.0.5-apache
	'nextcloud-cli-postgres' [6/8]...failed
testing nextcloud:20.0.5-fpm
	'nextcloud-cli-postgres' [6/8]...failed
testing nextcloud:21.0.0beta6-apache
	'nextcloud-cli-mysql' [5/8]...failed

@yosifkit yosifkit merged commit 9cb2d83 into docker-library:master Jan 15, 2021
@J0WI J0WI deleted the nextcloud-20.0.5 branch January 15, 2021 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/nextcloud
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@J0WI @yosifkit