-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 #17861
Merged
Merged
Update Nextcloud #17861
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 1a1d859:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0ae102b..2d46718 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,47 +1,47 @@
Maintainers: Nextcloud <[email protected]> (@nextcloud)
GitRepo: https://github.com/nextcloud/docker.git
-Tags: 28.0.11-apache, 28.0-apache, 28-apache, 28.0.11, 28.0, 28
+Tags: 28.0.12-apache, 28.0-apache, 28-apache, 28.0.12, 28.0, 28
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 28/apache
-Tags: 28.0.11-fpm, 28.0-fpm, 28-fpm
+Tags: 28.0.12-fpm, 28.0-fpm, 28-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 28/fpm
-Tags: 28.0.11-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
+Tags: 28.0.12-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 28/fpm-alpine
-Tags: 29.0.8-apache, 29.0-apache, 29-apache, 29.0.8, 29.0, 29
+Tags: 29.0.9-apache, 29.0-apache, 29-apache, 29.0.9, 29.0, 29
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 29/apache
-Tags: 29.0.8-fpm, 29.0-fpm, 29-fpm
+Tags: 29.0.9-fpm, 29.0-fpm, 29-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 29/fpm
-Tags: 29.0.8-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine
+Tags: 29.0.9-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 29/fpm-alpine
-Tags: 30.0.1-apache, 30.0-apache, 30-apache, apache, stable-apache, production-apache, 30.0.1, 30.0, 30, latest, stable, production
+Tags: 30.0.2-apache, 30.0-apache, 30-apache, apache, stable-apache, production-apache, 30.0.2, 30.0, 30, latest, stable, production
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 30/apache
-Tags: 30.0.1-fpm, 30.0-fpm, 30-fpm, fpm, stable-fpm, production-fpm
+Tags: 30.0.2-fpm, 30.0-fpm, 30-fpm, fpm, stable-fpm, production-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 30/fpm
-Tags: 30.0.1-fpm-alpine, 30.0-fpm-alpine, 30-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 30.0.2-fpm-alpine, 30.0-fpm-alpine, 30-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: d03da64ac80d534c1b0ec69da3e6ddcc6af282a6
+GitCommit: 4f130dc7527e9f405349767596b168c81b45ba24
Directory: 30/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 1c6a3b0..4a59453 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ nextcloud:28.0
nextcloud:28.0-apache
nextcloud:28.0-fpm
nextcloud:28.0-fpm-alpine
-nextcloud:28.0.11
-nextcloud:28.0.11-apache
-nextcloud:28.0.11-fpm
-nextcloud:28.0.11-fpm-alpine
+nextcloud:28.0.12
+nextcloud:28.0.12-apache
+nextcloud:28.0.12-fpm
+nextcloud:28.0.12-fpm-alpine
nextcloud:29
nextcloud:29-apache
nextcloud:29-fpm
@@ -18,10 +18,10 @@ nextcloud:29.0
nextcloud:29.0-apache
nextcloud:29.0-fpm
nextcloud:29.0-fpm-alpine
-nextcloud:29.0.8
-nextcloud:29.0.8-apache
-nextcloud:29.0.8-fpm
-nextcloud:29.0.8-fpm-alpine
+nextcloud:29.0.9
+nextcloud:29.0.9-apache
+nextcloud:29.0.9-fpm
+nextcloud:29.0.9-fpm-alpine
nextcloud:30
nextcloud:30-apache
nextcloud:30-fpm
@@ -30,10 +30,10 @@ nextcloud:30.0
nextcloud:30.0-apache
nextcloud:30.0-fpm
nextcloud:30.0-fpm-alpine
-nextcloud:30.0.1
-nextcloud:30.0.1-apache
-nextcloud:30.0.1-fpm
-nextcloud:30.0.1-fpm-alpine
+nextcloud:30.0.2
+nextcloud:30.0.2-apache
+nextcloud:30.0.2-fpm
+nextcloud:30.0.2-fpm-alpine
nextcloud:apache
nextcloud:fpm
nextcloud:fpm-alpine
diff --git a/nextcloud_28-fpm-alpine/Dockerfile b/nextcloud_28-fpm-alpine/Dockerfile
index a735229..18af338 100644
--- a/nextcloud_28-fpm-alpine/Dockerfile
+++ b/nextcloud_28-fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 28.0.11
+ENV NEXTCLOUD_VERSION 28.0.12
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
gnupg \
; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_28-fpm-alpine/config/s3.config.php b/nextcloud_28-fpm-alpine/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_28-fpm-alpine/config/s3.config.php
+++ b/nextcloud_28-fpm-alpine/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
diff --git a/nextcloud_28-fpm/Dockerfile b/nextcloud_28-fpm/Dockerfile
index ae69769..40598ea 100644
--- a/nextcloud_28-fpm/Dockerfile
+++ b/nextcloud_28-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 28.0.11
+ENV NEXTCLOUD_VERSION 28.0.12
RUN set -ex; \
fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_28-fpm/config/s3.config.php b/nextcloud_28-fpm/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_28-fpm/config/s3.config.php
+++ b/nextcloud_28-fpm/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
diff --git a/nextcloud_28/Dockerfile b/nextcloud_28/Dockerfile
index d63fb3a..00bfaa7 100644
--- a/nextcloud_28/Dockerfile
+++ b/nextcloud_28/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
} > /etc/apache2/conf-available/apache-limits.conf; \
a2enconf apache-limits
-ENV NEXTCLOUD_VERSION 28.0.11
+ENV NEXTCLOUD_VERSION 28.0.12
RUN set -ex; \
fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_28/config/s3.config.php b/nextcloud_28/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_28/config/s3.config.php
+++ b/nextcloud_28/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
diff --git a/nextcloud_29-fpm-alpine/Dockerfile b/nextcloud_29-fpm-alpine/Dockerfile
index 5344aed..de280bc 100644
--- a/nextcloud_29-fpm-alpine/Dockerfile
+++ b/nextcloud_29-fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 29.0.8
+ENV NEXTCLOUD_VERSION 29.0.9
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
gnupg \
; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_29-fpm-alpine/config/s3.config.php b/nextcloud_29-fpm-alpine/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_29-fpm-alpine/config/s3.config.php
+++ b/nextcloud_29-fpm-alpine/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
diff --git a/nextcloud_29-fpm/Dockerfile b/nextcloud_29-fpm/Dockerfile
index a69317b..c0ebab1 100644
--- a/nextcloud_29-fpm/Dockerfile
+++ b/nextcloud_29-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 29.0.8
+ENV NEXTCLOUD_VERSION 29.0.9
RUN set -ex; \
fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_29-fpm/config/s3.config.php b/nextcloud_29-fpm/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_29-fpm/config/s3.config.php
+++ b/nextcloud_29-fpm/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
diff --git a/nextcloud_29/Dockerfile b/nextcloud_29/Dockerfile
index 8e9316c..58132fb 100644
--- a/nextcloud_29/Dockerfile
+++ b/nextcloud_29/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
} > /etc/apache2/conf-available/apache-limits.conf; \
a2enconf apache-limits
-ENV NEXTCLOUD_VERSION 29.0.8
+ENV NEXTCLOUD_VERSION 29.0.9
RUN set -ex; \
fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_29/config/s3.config.php b/nextcloud_29/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_29/config/s3.config.php
+++ b/nextcloud_29/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index a6197cc..79783a6 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 30.0.1
+ENV NEXTCLOUD_VERSION 30.0.2
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
gnupg \
; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_production-fpm-alpine/config/s3.config.php b/nextcloud_production-fpm-alpine/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_production-fpm-alpine/config/s3.config.php
+++ b/nextcloud_production-fpm-alpine/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 9ab2e05..4258ff9 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 30.0.1
+ENV NEXTCLOUD_VERSION 30.0.2
RUN set -ex; \
fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_production-fpm/config/s3.config.php b/nextcloud_production-fpm/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_production-fpm/config/s3.config.php
+++ b/nextcloud_production-fpm/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index b01d961..0e0fd6a 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
} > /etc/apache2/conf-available/apache-limits.conf; \
a2enconf apache-limits
-ENV NEXTCLOUD_VERSION 30.0.1
+ENV NEXTCLOUD_VERSION 30.0.2
RUN set -ex; \
fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends $fetchDeps; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
export GNUPGHOME="$(mktemp -d)"; \
# gpg key from https://nextcloud.com/nextcloud.asc
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_production/config/s3.config.php b/nextcloud_production/config/s3.config.php
index 9941c56..a17e403 100644
--- a/nextcloud_production/config/s3.config.php
+++ b/nextcloud_production/config/s3.config.php
@@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+ 'autocreate' => strtolower($autocreate) !== 'false',
+ 'use_ssl' => strtolower($use_ssl) !== 'false',
// required for some non Amazon S3 implementations
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
// required for older protocol versions Relevant Maintainers:
|
tianon
approved these changes
Nov 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.