-
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 #18255
Merged
Merged
Update Nextcloud #18255
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 e53f9f3:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0fcf506..e5f7597 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,45 +3,45 @@ GitRepo: /~https://github.com/nextcloud/docker.git
Tags: 28.0.14-apache, 28.0-apache, 28-apache, 28.0.14, 28.0, 28
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f4138903323bfb04326373804ea3dbbd4ffe94e4
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 28/apache
Tags: 28.0.14-fpm, 28.0-fpm, 28-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f4138903323bfb04326373804ea3dbbd4ffe94e4
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 28/fpm
Tags: 28.0.14-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f4138903323bfb04326373804ea3dbbd4ffe94e4
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 28/fpm-alpine
-Tags: 29.0.10-apache, 29.0-apache, 29-apache, 29.0.10, 29.0, 29
+Tags: 29.0.11-apache, 29.0-apache, 29-apache, 29.0.11, 29.0, 29
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 99ddd0978372e6dc17e4d923b33e543aae7eee35
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 29/apache
-Tags: 29.0.10-fpm, 29.0-fpm, 29-fpm
+Tags: 29.0.11-fpm, 29.0-fpm, 29-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 99ddd0978372e6dc17e4d923b33e543aae7eee35
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 29/fpm
-Tags: 29.0.10-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine
+Tags: 29.0.11-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 99ddd0978372e6dc17e4d923b33e543aae7eee35
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 29/fpm-alpine
-Tags: 30.0.4-apache, 30.0-apache, 30-apache, apache, stable-apache, production-apache, 30.0.4, 30.0, 30, latest, stable, production
+Tags: 30.0.5-apache, 30.0-apache, 30-apache, apache, stable-apache, production-apache, 30.0.5, 30.0, 30, latest, stable, production
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f4138903323bfb04326373804ea3dbbd4ffe94e4
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 30/apache
-Tags: 30.0.4-fpm, 30.0-fpm, 30-fpm, fpm, stable-fpm, production-fpm
+Tags: 30.0.5-fpm, 30.0-fpm, 30-fpm, fpm, stable-fpm, production-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f4138903323bfb04326373804ea3dbbd4ffe94e4
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 30/fpm
-Tags: 30.0.4-fpm-alpine, 30.0-fpm-alpine, 30-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 30.0.5-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: f4138903323bfb04326373804ea3dbbd4ffe94e4
+GitCommit: a43854ae5c7c6eeb327d1fc82d020d7ea21bbb33
Directory: 30/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index bf6c6c3..46f007f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,10 +18,10 @@ nextcloud:29.0
nextcloud:29.0-apache
nextcloud:29.0-fpm
nextcloud:29.0-fpm-alpine
-nextcloud:29.0.10
-nextcloud:29.0.10-apache
-nextcloud:29.0.10-fpm
-nextcloud:29.0.10-fpm-alpine
+nextcloud:29.0.11
+nextcloud:29.0.11-apache
+nextcloud:29.0.11-fpm
+nextcloud:29.0.11-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.4
-nextcloud:30.0.4-apache
-nextcloud:30.0.4-fpm
-nextcloud:30.0.4-fpm-alpine
+nextcloud:30.0.5
+nextcloud:30.0.5-apache
+nextcloud:30.0.5-fpm
+nextcloud:30.0.5-fpm-alpine
nextcloud:apache
nextcloud:fpm
nextcloud:fpm-alpine
diff --git a/nextcloud_28-fpm-alpine/Dockerfile b/nextcloud_28-fpm-alpine/Dockerfile
index 02cd4a2..54f5ab1 100644
--- a/nextcloud_28-fpm-alpine/Dockerfile
+++ b/nextcloud_28-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@@ -89,11 +89,12 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
diff --git a/nextcloud_28-fpm-alpine/config/redis.config.php b/nextcloud_28-fpm-alpine/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_28-fpm-alpine/config/redis.config.php
+++ b/nextcloud_28-fpm-alpine/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
}
diff --git a/nextcloud_28-fpm/Dockerfile b/nextcloud_28-fpm/Dockerfile
index 3bf63e2..10647aa 100644
--- a/nextcloud_28-fpm/Dockerfile
+++ b/nextcloud_28-fpm/Dockerfile
@@ -21,6 +21,7 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN set -ex; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -98,7 +99,7 @@ RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
diff --git a/nextcloud_28-fpm/config/redis.config.php b/nextcloud_28-fpm/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_28-fpm/config/redis.config.php
+++ b/nextcloud_28-fpm/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
}
diff --git a/nextcloud_28/Dockerfile b/nextcloud_28/Dockerfile
index 2060d4b..98cb958 100644
--- a/nextcloud_28/Dockerfile
+++ b/nextcloud_28/Dockerfile
@@ -21,6 +21,7 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN set -ex; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -98,7 +99,7 @@ RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
diff --git a/nextcloud_28/config/redis.config.php b/nextcloud_28/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_28/config/redis.config.php
+++ b/nextcloud_28/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
}
diff --git a/nextcloud_29-fpm-alpine/Dockerfile b/nextcloud_29-fpm-alpine/Dockerfile
index 4e147a5..59daebf 100644
--- a/nextcloud_29-fpm-alpine/Dockerfile
+++ b/nextcloud_29-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@@ -89,11 +89,12 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
@@ -120,7 +121,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 29.0.10
+ENV NEXTCLOUD_VERSION 29.0.11
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +129,8 @@ RUN set -ex; \
gnupg \
; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.11.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.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_29-fpm-alpine/config/redis.config.php b/nextcloud_29-fpm-alpine/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_29-fpm-alpine/config/redis.config.php
+++ b/nextcloud_29-fpm-alpine/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
}
diff --git a/nextcloud_29-fpm/Dockerfile b/nextcloud_29-fpm/Dockerfile
index d18949c..657df0e 100644
--- a/nextcloud_29-fpm/Dockerfile
+++ b/nextcloud_29-fpm/Dockerfile
@@ -21,6 +21,7 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN set -ex; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -98,7 +99,7 @@ RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
@@ -125,7 +126,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 29.0.10
+ENV NEXTCLOUD_VERSION 29.0.11
RUN set -ex; \
fetchDeps=" \
@@ -135,8 +136,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.10.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.11.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.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_29-fpm/config/redis.config.php b/nextcloud_29-fpm/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_29-fpm/config/redis.config.php
+++ b/nextcloud_29-fpm/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
}
diff --git a/nextcloud_29/Dockerfile b/nextcloud_29/Dockerfile
index a436700..cb48fdc 100644
--- a/nextcloud_29/Dockerfile
+++ b/nextcloud_29/Dockerfile
@@ -21,6 +21,7 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN set -ex; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -98,7 +99,7 @@ RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
@@ -140,7 +141,7 @@ RUN { \
} > /etc/apache2/conf-available/apache-limits.conf; \
a2enconf apache-limits
-ENV NEXTCLOUD_VERSION 29.0.10
+ENV NEXTCLOUD_VERSION 29.0.11
RUN set -ex; \
fetchDeps=" \
@@ -150,8 +151,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.10.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.11.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.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_29/config/redis.config.php b/nextcloud_29/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_29/config/redis.config.php
+++ b/nextcloud_29/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
}
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index 52ea716..e7efd0c 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@@ -89,11 +89,12 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
@@ -120,7 +121,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 30.0.4
+ENV NEXTCLOUD_VERSION 30.0.5
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +129,8 @@ RUN set -ex; \
gnupg \
; \
\
- curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.5.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.5.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/redis.config.php b/nextcloud_production-fpm-alpine/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_production-fpm-alpine/config/redis.config.php
+++ b/nextcloud_production-fpm-alpine/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
}
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index dfe4961..593d4b3 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -21,6 +21,7 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN set -ex; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -98,7 +99,7 @@ RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
@@ -125,7 +126,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 30.0.4
+ENV NEXTCLOUD_VERSION 30.0.5
RUN set -ex; \
fetchDeps=" \
@@ -135,8 +136,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.4.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.5.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.5.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/redis.config.php b/nextcloud_production-fpm/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_production-fpm/config/redis.config.php
+++ b/nextcloud_production-fpm/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
}
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index 73ac6cc..2119594 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/Dockerfile
@@ -21,6 +21,7 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M
+ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
RUN set -ex; \
\
savedAptMark="$(apt-mark showmanual)"; \
@@ -98,7 +99,7 @@ RUN { \
echo 'opcache.enable=1'; \
echo 'opcache.interned_strings_buffer=32'; \
echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
+ echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.jit=1255'; \
@@ -140,7 +141,7 @@ RUN { \
} > /etc/apache2/conf-available/apache-limits.conf; \
a2enconf apache-limits
-ENV NEXTCLOUD_VERSION 30.0.4
+ENV NEXTCLOUD_VERSION 30.0.5
RUN set -ex; \
fetchDeps=" \
@@ -150,8 +151,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.4.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
+ curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.5.tar.bz2"; \
+ curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.5.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/redis.config.php b/nextcloud_production/config/redis.config.php
index a5b13da..2069812 100644
--- a/nextcloud_production/config/redis.config.php
+++ b/nextcloud_production/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
} elseif (getenv('REDIS_HOST')[0] != '/') {
$CONFIG['redis']['port'] = 6379;
}
+
+ if (getenv('REDIS_HOST_USER') !== false) {
+ $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+ }
} Relevant Maintainers:
|
tianon
approved these changes
Jan 17, 2025
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.