summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.examples/README.md3
-rw-r--r--.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml2
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml2
-rw-r--r--23/apache/Dockerfile2
-rw-r--r--23/fpm-alpine/Dockerfile2
-rw-r--r--23/fpm/Dockerfile2
-rw-r--r--24/apache/Dockerfile4
-rw-r--r--24/fpm-alpine/Dockerfile4
-rw-r--r--24/fpm/Dockerfile4
-rw-r--r--25/apache/Dockerfile4
-rw-r--r--25/fpm-alpine/Dockerfile4
-rw-r--r--25/fpm/Dockerfile4
-rw-r--r--Dockerfile-alpine.template2
-rw-r--r--Dockerfile-debian.template2
-rw-r--r--README.md6
-rwxr-xr-xgenerate-stackbrew-library.sh2
-rw-r--r--latest.txt2
19 files changed, 41 insertions, 14 deletions
diff --git a/.examples/README.md b/.examples/README.md
index 6358bc34..b505b3ac 100644
--- a/.examples/README.md
+++ b/.examples/README.md
@@ -18,6 +18,9 @@ Example | Description
[smb](https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/smb) | adds dependencies required to use smb shares
[full](https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/full) | adds dependencies for ALL optional packages and cron functionality via supervisor (as in the `cron` example Dockerfile).
+### cron
+NOTE: [this container must run as root or `cron.php` will not run](https://github.com/nextcloud/docker/issues/1899).
+
### full
The `full` Dockerfile example adds dependencies for all optional packages suggested by nextcloud that may be needed for some features (e.g. Video Preview Generation), as stated in the [Administration Manual](https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html).
diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
index d5e30393..facf6fd2 100644
--- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
services:
db:
image: mariadb:10.5
- command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
restart: always
volumes:
- db:/var/lib/mysql
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
index c3c94f39..1b9b3039 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
services:
db:
image: mariadb:10.5
- command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
restart: always
volumes:
- db:/var/lib/mysql
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
index eaf18678..d88c9db4 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
services:
db:
image: mariadb:10.5
- command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
restart: always
volumes:
- db:/var/lib/mysql
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 80088993..c4e6fec3 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
services:
db:
image: mariadb:10.5
- command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
restart: always
volumes:
- db:/var/lib/mysql
diff --git a/23/apache/Dockerfile b/23/apache/Dockerfile
index fe2cb684..d1a7e28a 100644
--- a/23/apache/Dockerfile
+++ b/23/apache/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
diff --git a/23/fpm-alpine/Dockerfile b/23/fpm-alpine/Dockerfile
index 1fcc954c..28cd103a 100644
--- a/23/fpm-alpine/Dockerfile
+++ b/23/fpm-alpine/Dockerfile
@@ -86,6 +86,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
diff --git a/23/fpm/Dockerfile b/23/fpm/Dockerfile
index a1ac26f4..8822a209 100644
--- a/23/fpm/Dockerfile
+++ b/23/fpm/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile
index 23a9c7b9..fb349264 100644
--- a/24/apache/Dockerfile
+++ b/24/apache/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -123,7 +125,7 @@ RUN a2enmod headers rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 24.0.9
+ENV NEXTCLOUD_VERSION 24.0.10
RUN set -ex; \
fetchDeps=" \
diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile
index 594d55fd..dd187250 100644
--- a/24/fpm-alpine/Dockerfile
+++ b/24/fpm-alpine/Dockerfile
@@ -86,6 +86,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -103,7 +105,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 24.0.9
+ENV NEXTCLOUD_VERSION 24.0.10
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile
index 2c328bae..08a1680c 100644
--- a/24/fpm/Dockerfile
+++ b/24/fpm/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -115,7 +117,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 24.0.9
+ENV NEXTCLOUD_VERSION 24.0.10
RUN set -ex; \
fetchDeps=" \
diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile
index 9fd73e8b..29170ec0 100644
--- a/25/apache/Dockerfile
+++ b/25/apache/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -123,7 +125,7 @@ RUN a2enmod headers rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 25.0.3
+ENV NEXTCLOUD_VERSION 25.0.4
RUN set -ex; \
fetchDeps=" \
diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile
index 07565f41..1dc04677 100644
--- a/25/fpm-alpine/Dockerfile
+++ b/25/fpm-alpine/Dockerfile
@@ -86,6 +86,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -103,7 +105,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 25.0.3
+ENV NEXTCLOUD_VERSION 25.0.4
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile
index 7d35b0b9..0e359e43 100644
--- a/25/fpm/Dockerfile
+++ b/25/fpm/Dockerfile
@@ -98,6 +98,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
@@ -115,7 +117,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 25.0.3
+ENV NEXTCLOUD_VERSION 25.0.4
RUN set -ex; \
fetchDeps=" \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 84d97395..c33b1971 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -85,6 +85,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 4d2e6044..5427e2c2 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -99,6 +99,8 @@ RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.save_comments=1'; \
echo 'opcache.revalidate_freq=60'; \
+ echo 'opcache.jit=1255'; \
+ echo 'opcache.jit_buffer_size=128M'; \
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
\
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
diff --git a/README.md b/README.md
index 8f891593..6fd5cbc9 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ A safe home for all your data. Access & share your files, calendars, contacts, m
![logo](https://cdn.rawgit.com/nextcloud/docker/80dd587d847b184ba95d7187a2a7a56ae4cbbb7b/logo.svg)
+This Docker micro-service image is developed and maintained by the Nextcloud community. Nextcloud GmbH does not offer support for this Docker image. When you are looking to get professional support, you can become an [enterprise](https://nextcloud.com/enterprise/) customer or use [AIO](https://github.com/nextcloud/all-in-one#nextcloud-all-in-one).
+
# How to use this image
This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
@@ -237,7 +239,7 @@ services:
db:
image: mariadb:10.5
restart: always
- command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
volumes:
- db:/var/lib/mysql
environment:
@@ -283,7 +285,7 @@ services:
db:
image: mariadb:10.5
restart: always
- command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
volumes:
- db:/var/lib/mysql
environment:
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index ab82b105..ee48c9c9 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-stable_channel='25.0.3'
+stable_channel='25.0.4'
self="$(basename "$BASH_SOURCE")"
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
diff --git a/latest.txt b/latest.txt
index b4e48e14..16a5a23a 100644
--- a/latest.txt
+++ b/latest.txt
@@ -1 +1 @@
-25.0.3
+25.0.4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:31:35 +0000