Update Nextcloud #17713
Merged
Update Nextcloud #17713
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 337f80f:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 13ebbff..3ef232f 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.10-apache, 28.0-apache, 28-apache, 28.0.10, 28.0, 28
+Tags: 28.0.11-apache, 28.0-apache, 28-apache, 28.0.11, 28.0, 28
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 178f8b65d34f49f649aa729de148c24a4d79db84
Directory: 28/apache
-Tags: 28.0.10-fpm, 28.0-fpm, 28-fpm
+Tags: 28.0.11-fpm, 28.0-fpm, 28-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 178f8b65d34f49f649aa729de148c24a4d79db84
Directory: 28/fpm
-Tags: 28.0.10-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
+Tags: 28.0.11-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 178f8b65d34f49f649aa729de148c24a4d79db84
Directory: 28/fpm-alpine
-Tags: 29.0.7-apache, 29.0-apache, 29-apache, stable-apache, production-apache, 29.0.7, 29.0, 29, stable, production
+Tags: 29.0.8-apache, 29.0-apache, 29-apache, 29.0.8, 29.0, 29
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 178f8b65d34f49f649aa729de148c24a4d79db84
Directory: 29/apache
-Tags: 29.0.7-fpm, 29.0-fpm, 29-fpm, stable-fpm, production-fpm
+Tags: 29.0.8-fpm, 29.0-fpm, 29-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 178f8b65d34f49f649aa729de148c24a4d79db84
Directory: 29/fpm
-Tags: 29.0.7-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 29.0.8-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 178f8b65d34f49f649aa729de148c24a4d79db84
Directory: 29/fpm-alpine
Tags: 30.0.0-apache, 30.0-apache, 30-apache, apache, 30.0.0, 30.0, 30, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 6c1075b88d7184b067ce7c685ed55d136f7f0635
Directory: 30/apache
Tags: 30.0.0-fpm, 30.0-fpm, 30-fpm, fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 6c1075b88d7184b067ce7c685ed55d136f7f0635
Directory: 30/fpm
Tags: 30.0.0-fpm-alpine, 30.0-fpm-alpine, 30-fpm-alpine, fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+GitCommit: 6c1075b88d7184b067ce7c685ed55d136f7f0635
Directory: 30/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index ea78f69..74e3a34 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.10
-nextcloud:28.0.10-apache
-nextcloud:28.0.10-fpm
-nextcloud:28.0.10-fpm-alpine
+nextcloud:28.0.11
+nextcloud:28.0.11-apache
+nextcloud:28.0.11-fpm
+nextcloud:28.0.11-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.7
-nextcloud:29.0.7-apache
-nextcloud:29.0.7-fpm
-nextcloud:29.0.7-fpm-alpine
+nextcloud:29.0.8
+nextcloud:29.0.8-apache
+nextcloud:29.0.8-fpm
+nextcloud:29.0.8-fpm-alpine
nextcloud:30
nextcloud:30-apache
nextcloud:30-fpm
@@ -38,11 +38,3 @@ nextcloud:apache
nextcloud:fpm
nextcloud:fpm-alpine
nextcloud:latest
-nextcloud:production
-nextcloud:production-apache
-nextcloud:production-fpm
-nextcloud:production-fpm-alpine
-nextcloud:stable
-nextcloud:stable-apache
-nextcloud:stable-fpm
-nextcloud:stable-fpm-alpine
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index d702661..59643bd 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,9 @@
nextcloud:28
nextcloud:28-fpm
nextcloud:28-fpm-alpine
+nextcloud:29
+nextcloud:29-fpm
+nextcloud:29-fpm-alpine
nextcloud:fpm
nextcloud:fpm-alpine
nextcloud:latest
-nextcloud:production
-nextcloud:production-fpm
-nextcloud:production-fpm-alpine
diff --git a/nextcloud_28-fpm-alpine/Dockerfile b/nextcloud_28-fpm-alpine/Dockerfile
index 02ab245..5d0f0eb 100644
--- a/nextcloud_28-fpm-alpine/Dockerfile
+++ b/nextcloud_28-fpm-alpine/Dockerfile
@@ -63,10 +63,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
@@ -120,7 +120,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 28.0.10
+ENV NEXTCLOUD_VERSION 28.0.11
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.10.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2.asc"; \
+ 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"; \
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/reverse-proxy.config.php b/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
+++ b/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_28-fpm/Dockerfile b/nextcloud_28-fpm/Dockerfile
index 17432c8..b4531ee 100644
--- a/nextcloud_28-fpm/Dockerfile
+++ b/nextcloud_28-fpm/Dockerfile
@@ -65,10 +65,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
@@ -125,7 +125,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 28.0.10
+ENV NEXTCLOUD_VERSION 28.0.11
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.10.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2.asc"; \
+ 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"; \
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/reverse-proxy.config.php b/nextcloud_28-fpm/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_28-fpm/config/reverse-proxy.config.php
+++ b/nextcloud_28-fpm/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_28/Dockerfile b/nextcloud_28/Dockerfile
index 9ac2e52..a9e4f15 100644
--- a/nextcloud_28/Dockerfile
+++ b/nextcloud_28/Dockerfile
@@ -65,10 +65,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
@@ -140,7 +140,7 @@ RUN { \
} > /etc/apache2/conf-available/apache-limits.conf; \
a2enconf apache-limits
-ENV NEXTCLOUD_VERSION 28.0.10
+ENV NEXTCLOUD_VERSION 28.0.11
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.10.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2.asc"; \
+ 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"; \
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/reverse-proxy.config.php b/nextcloud_28/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_28/config/reverse-proxy.config.php
+++ b/nextcloud_28/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_29-fpm-alpine/Dockerfile
similarity index 95%
rename from nextcloud_production-fpm-alpine/Dockerfile
rename to nextcloud_29-fpm-alpine/Dockerfile
index 5e8aa0f..bd0828e 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_29-fpm-alpine/Dockerfile
@@ -63,10 +63,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
@@ -120,7 +120,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 29.0.7
+ENV NEXTCLOUD_VERSION 29.0.8
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.7.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2.asc"; \
+ 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"; \
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/apcu.config.php b/nextcloud_29-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apcu.config.php
rename to nextcloud_29-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_production-fpm-alpine/config/apps.config.php b/nextcloud_29-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apps.config.php
rename to nextcloud_29-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_production-fpm-alpine/config/autoconfig.php b/nextcloud_29-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/autoconfig.php
rename to nextcloud_29-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_production-fpm-alpine/config/redis.config.php b/nextcloud_29-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/redis.config.php
rename to nextcloud_29-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_28-fpm/config/reverse-proxy.config.php b/nextcloud_29-fpm-alpine/config/reverse-proxy.config.php
similarity index 80%
copy from nextcloud_28-fpm/config/reverse-proxy.config.php
copy to nextcloud_29-fpm-alpine/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_28-fpm/config/reverse-proxy.config.php
+++ b/nextcloud_29-fpm-alpine/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_production-fpm-alpine/config/s3.config.php b/nextcloud_29-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/s3.config.php
rename to nextcloud_29-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_production-fpm-alpine/config/smtp.config.php b/nextcloud_29-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/smtp.config.php
rename to nextcloud_29-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_production-fpm-alpine/config/swift.config.php b/nextcloud_29-fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/swift.config.php
rename to nextcloud_29-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_production-fpm-alpine/config/upgrade-disable-web.config.php b/nextcloud_29-fpm-alpine/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/upgrade-disable-web.config.php
rename to nextcloud_29-fpm-alpine/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production-fpm-alpine/cron.sh b/nextcloud_29-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/cron.sh
rename to nextcloud_29-fpm-alpine/cron.sh
diff --git a/nextcloud_production-fpm-alpine/entrypoint.sh b/nextcloud_29-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/entrypoint.sh
rename to nextcloud_29-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_production-fpm-alpine/upgrade.exclude b/nextcloud_29-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm-alpine/upgrade.exclude
rename to nextcloud_29-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_29-fpm/Dockerfile
similarity index 96%
rename from nextcloud_production-fpm/Dockerfile
rename to nextcloud_29-fpm/Dockerfile
index a134d72..1b21652 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_29-fpm/Dockerfile
@@ -65,10 +65,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
@@ -125,7 +125,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 29.0.7
+ENV NEXTCLOUD_VERSION 29.0.8
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.7.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2.asc"; \
+ 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"; \
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/apcu.config.php b/nextcloud_29-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apcu.config.php
rename to nextcloud_29-fpm/config/apcu.config.php
diff --git a/nextcloud_production-fpm/config/apps.config.php b/nextcloud_29-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apps.config.php
rename to nextcloud_29-fpm/config/apps.config.php
diff --git a/nextcloud_production-fpm/config/autoconfig.php b/nextcloud_29-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm/config/autoconfig.php
rename to nextcloud_29-fpm/config/autoconfig.php
diff --git a/nextcloud_production-fpm/config/redis.config.php b/nextcloud_29-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/redis.config.php
rename to nextcloud_29-fpm/config/redis.config.php
diff --git a/nextcloud_28-fpm/config/reverse-proxy.config.php b/nextcloud_29-fpm/config/reverse-proxy.config.php
similarity index 80%
copy from nextcloud_28-fpm/config/reverse-proxy.config.php
copy to nextcloud_29-fpm/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_28-fpm/config/reverse-proxy.config.php
+++ b/nextcloud_29-fpm/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_production-fpm/config/s3.config.php b/nextcloud_29-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/s3.config.php
rename to nextcloud_29-fpm/config/s3.config.php
diff --git a/nextcloud_production-fpm/config/smtp.config.php b/nextcloud_29-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/smtp.config.php
rename to nextcloud_29-fpm/config/smtp.config.php
diff --git a/nextcloud_production-fpm/config/swift.config.php b/nextcloud_29-fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/swift.config.php
rename to nextcloud_29-fpm/config/swift.config.php
diff --git a/nextcloud_production-fpm/config/upgrade-disable-web.config.php b/nextcloud_29-fpm/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/upgrade-disable-web.config.php
rename to nextcloud_29-fpm/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production-fpm/cron.sh b/nextcloud_29-fpm/cron.sh
similarity index 100%
rename from nextcloud_production-fpm/cron.sh
rename to nextcloud_29-fpm/cron.sh
diff --git a/nextcloud_production-fpm/entrypoint.sh b/nextcloud_29-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_production-fpm/entrypoint.sh
rename to nextcloud_29-fpm/entrypoint.sh
diff --git a/nextcloud_production-fpm/upgrade.exclude b/nextcloud_29-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm/upgrade.exclude
rename to nextcloud_29-fpm/upgrade.exclude
diff --git a/nextcloud_production/Dockerfile b/nextcloud_29/Dockerfile
similarity index 96%
rename from nextcloud_production/Dockerfile
rename to nextcloud_29/Dockerfile
index 371d4cd..874348e 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_29/Dockerfile
@@ -65,10 +65,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
@@ -140,7 +140,7 @@ RUN { \
} > /etc/apache2/conf-available/apache-limits.conf; \
a2enconf apache-limits
-ENV NEXTCLOUD_VERSION 29.0.7
+ENV NEXTCLOUD_VERSION 29.0.8
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.7.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2.asc"; \
+ 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"; \
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/apache-pretty-urls.config.php b/nextcloud_29/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_production/config/apache-pretty-urls.config.php
rename to nextcloud_29/config/apache-pretty-urls.config.php
diff --git a/nextcloud_production/config/apcu.config.php b/nextcloud_29/config/apcu.config.php
similarity index 100%
rename from nextcloud_production/config/apcu.config.php
rename to nextcloud_29/config/apcu.config.php
diff --git a/nextcloud_production/config/apps.config.php b/nextcloud_29/config/apps.config.php
similarity index 100%
rename from nextcloud_production/config/apps.config.php
rename to nextcloud_29/config/apps.config.php
diff --git a/nextcloud_production/config/autoconfig.php b/nextcloud_29/config/autoconfig.php
similarity index 100%
rename from nextcloud_production/config/autoconfig.php
rename to nextcloud_29/config/autoconfig.php
diff --git a/nextcloud_production/config/redis.config.php b/nextcloud_29/config/redis.config.php
similarity index 100%
rename from nextcloud_production/config/redis.config.php
rename to nextcloud_29/config/redis.config.php
diff --git a/nextcloud_28-fpm/config/reverse-proxy.config.php b/nextcloud_29/config/reverse-proxy.config.php
similarity index 80%
copy from nextcloud_28-fpm/config/reverse-proxy.config.php
copy to nextcloud_29/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_28-fpm/config/reverse-proxy.config.php
+++ b/nextcloud_29/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_production/config/s3.config.php b/nextcloud_29/config/s3.config.php
similarity index 100%
rename from nextcloud_production/config/s3.config.php
rename to nextcloud_29/config/s3.config.php
diff --git a/nextcloud_production/config/smtp.config.php b/nextcloud_29/config/smtp.config.php
similarity index 100%
rename from nextcloud_production/config/smtp.config.php
rename to nextcloud_29/config/smtp.config.php
diff --git a/nextcloud_production/config/swift.config.php b/nextcloud_29/config/swift.config.php
similarity index 100%
rename from nextcloud_production/config/swift.config.php
rename to nextcloud_29/config/swift.config.php
diff --git a/nextcloud_production/config/upgrade-disable-web.config.php b/nextcloud_29/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production/config/upgrade-disable-web.config.php
rename to nextcloud_29/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production/cron.sh b/nextcloud_29/cron.sh
similarity index 100%
rename from nextcloud_production/cron.sh
rename to nextcloud_29/cron.sh
diff --git a/nextcloud_production/entrypoint.sh b/nextcloud_29/entrypoint.sh
similarity index 100%
rename from nextcloud_production/entrypoint.sh
rename to nextcloud_29/entrypoint.sh
diff --git a/nextcloud_production/upgrade.exclude b/nextcloud_29/upgrade.exclude
similarity index 100%
rename from nextcloud_production/upgrade.exclude
rename to nextcloud_29/upgrade.exclude
diff --git a/nextcloud_fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
index 11c6e1b..9a553d7 100644
--- a/nextcloud_fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -63,10 +63,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
diff --git a/nextcloud_fpm-alpine/config/reverse-proxy.config.php b/nextcloud_fpm-alpine/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_fpm-alpine/config/reverse-proxy.config.php
+++ b/nextcloud_fpm-alpine/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_fpm/Dockerfile b/nextcloud_fpm/Dockerfile
index e9a09f6..2877c10 100644
--- a/nextcloud_fpm/Dockerfile
+++ b/nextcloud_fpm/Dockerfile
@@ -65,10 +65,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
diff --git a/nextcloud_fpm/config/reverse-proxy.config.php b/nextcloud_fpm/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_fpm/config/reverse-proxy.config.php
+++ b/nextcloud_fpm/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_latest/Dockerfile
index 93642f7..abcd9e7 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_latest/Dockerfile
@@ -65,10 +65,10 @@ 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.23; \
+ pecl install APCu-5.1.24; \
pecl install imagick-3.7.0; \
pecl install memcached-3.2.0; \
- pecl install redis-6.0.2; \
+ pecl install redis-6.1.0; \
\
docker-php-ext-enable \
apcu \
diff --git a/nextcloud_latest/config/reverse-proxy.config.php b/nextcloud_latest/config/reverse-proxy.config.php
index 7df0415..30c660f 100644
--- a/nextcloud_latest/config/reverse-proxy.config.php
+++ b/nextcloud_latest/config/reverse-proxy.config.php
@@ -28,3 +28,8 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}
+
+$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
+if ($forwardedForHeaders) {
+ $CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
+}
diff --git a/nextcloud_production-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
deleted file mode 100644
index 7df0415..0000000
diff --git a/nextcloud_production-fpm/config/reverse-proxy.config.php b/nextcloud_production-fpm/config/reverse-proxy.config.php
deleted file mode 100644
index 7df0415..0000000
diff --git a/nextcloud_production/config/reverse-proxy.config.php b/nextcloud_production/config/reverse-proxy.config.php
deleted file mode 100644
index 7df0415..0000000Relevant Maintainers:
|
tianon
approved these changes
Oct 11, 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.