From 450ef60b050f29b15014ae701bb5df062ddccee7 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 13 Nov 2021 11:51:31 +0100 Subject: [PATCH 01/22] nextcloud version update 22.2.2 also move data folder from webroot / installation directory (needs config update!) --- webservice/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 266d3fc..d0dd242 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 21.0.5 +ENV NEXTCLOUD_VERSION 22.2.2 RUN \ apt-get update && \ @@ -98,7 +98,8 @@ ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf ADD update-htaccess.sh /update-htaccess.sh RUN crontab /opt/crontab && chmod +x /update-htaccess.sh +RUN mkdir /nc_data_ext && chown www-data: /nc_data_ext -VOLUME ["/var/www/html/config","/var/www/html/data"] +VOLUME ["/var/www/html/config","/nc_data_ext"] ENTRYPOINT ["supervisord"] -- 2.45.2 From b4e9cf6da1770575804384637ce8828d33e1e87e Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 25 Nov 2021 23:51:12 +0100 Subject: [PATCH 02/22] bump version number to 22.2.3 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index d0dd242..b75da56 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 22.2.2 +ENV NEXTCLOUD_VERSION 22.2.3 RUN \ apt-get update && \ -- 2.45.2 From 21290aba35c1798793c6461a471667eed89e6de9 Mon Sep 17 00:00:00 2001 From: bsod Date: Tue, 7 Dec 2021 19:45:49 +0100 Subject: [PATCH 03/22] fix db server version to 10.5 as it doesn't work with 10.6 --- db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/Dockerfile b/db/Dockerfile index 5ed26a0..ab8364f 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:latest +FROM mariadb:10.5 ADD innodb.cnf /etc/mysql/mariadb.conf.d/innodb.cnf -- 2.45.2 From a83a87fc70851d6cce71d102534615d5fcc5a09d Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 1 Feb 2022 22:25:22 +0100 Subject: [PATCH 04/22] update nextcloud to 23.0.1 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index b75da56..e8d0127 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 22.2.3 +ENV NEXTCLOUD_VERSION 23.0.1 RUN \ apt-get update && \ -- 2.45.2 From e34747b6774a3c5ed661ea8ec4008c03596ae68e Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 23 Feb 2022 20:08:46 +0100 Subject: [PATCH 05/22] update nextcloud to 23.0.2 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index e8d0127..d4ae0f3 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 23.0.1 +ENV NEXTCLOUD_VERSION 23.0.2 RUN \ apt-get update && \ -- 2.45.2 From eee0b089a3df802a46aaf97967c7b9102dbdc7d6 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 25 Mar 2022 19:41:16 +0100 Subject: [PATCH 06/22] 23.0.3 update --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index d4ae0f3..d44a5a5 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 23.0.2 +ENV NEXTCLOUD_VERSION 23.0.3 RUN \ apt-get update && \ -- 2.45.2 From cd32c17e82df9491fa2777a6b0d4fbff98ce8975 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 23 Apr 2022 20:47:19 +0200 Subject: [PATCH 07/22] update nextcloud to 23.0.4 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index d44a5a5..873129c 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 23.0.3 +ENV NEXTCLOUD_VERSION 23.0.4 RUN \ apt-get update && \ -- 2.45.2 From da0d0d5f786beae6f5554bcbba5c1cf483c3e72e Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 20 May 2022 00:52:29 +0200 Subject: [PATCH 08/22] update nextcloud to 24.0.1 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 873129c..0fb6754 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 23.0.4 +ENV NEXTCLOUD_VERSION 24.0.1 RUN \ apt-get update && \ -- 2.45.2 From c70ea09e4a7e7a07fd2ee652f1eebea023934ceb Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 22 Jun 2022 08:45:47 +0200 Subject: [PATCH 09/22] bump nextcloud version to 24.0.2 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 0fb6754..8cffd65 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 24.0.1 +ENV NEXTCLOUD_VERSION 24.0.2 RUN \ apt-get update && \ -- 2.45.2 From 73c6503499644a3f6891788ac2e78a67b62c2f32 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 16 Jul 2022 09:58:55 +0200 Subject: [PATCH 10/22] update php.ini: increase limits to match recommendations increase interned_strings_buffer as notified by the admin panel and increase the apc cache revalidation time as revalidating the php files isn't required that often (see https://docs.nextcloud.com/server/24/admin_manual/installation/server_tuning.html#enable-php-opcache) --- webservice/nextcloud_php.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webservice/nextcloud_php.ini b/webservice/nextcloud_php.ini index d2b64a3..816881a 100644 --- a/webservice/nextcloud_php.ini +++ b/webservice/nextcloud_php.ini @@ -1,10 +1,10 @@ opcache.enable=1 opcache.enable_cli=1 -opcache.interned_strings_buffer=8 +opcache.interned_strings_buffer=16 opcache.max_accelerated_files=10000 opcache.memory_consumption=128 opcache.save_comments=1 -opcache.revalidate_freq=1 +opcache.revalidate_freq=60 memory_limit = 1G apc.enable_cli=1 -- 2.45.2 From 178752806480a19ba834cbfa73db16e67e471e2c Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 19 Jul 2022 12:50:04 +0200 Subject: [PATCH 11/22] update nextcloud to 24.0.3 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 8cffd65..290a2cf 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 24.0.2 +ENV NEXTCLOUD_VERSION 24.0.3 RUN \ apt-get update && \ -- 2.45.2 From a162f8fb5655d788e043c4b2712000bcce8b83d4 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 12 Aug 2022 22:25:22 +0200 Subject: [PATCH 12/22] update nextcloud to 24.0.4 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 290a2cf..6c40ae8 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 24.0.3 +ENV NEXTCLOUD_VERSION 24.0.4 RUN \ apt-get update && \ -- 2.45.2 From 1bcc1951046f8a583b32f1fc071517f3e622c5e1 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 9 Sep 2022 09:28:22 +0200 Subject: [PATCH 13/22] update nextcloud to 24.0.5 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 6c40ae8..279aafe 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 24.0.4 +ENV NEXTCLOUD_VERSION 24.0.5 RUN \ apt-get update && \ -- 2.45.2 From 3f74b363ea91ec63296ab211a8367466612649c9 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 7 Oct 2022 10:38:20 +0200 Subject: [PATCH 14/22] nextcloud update to 24.0.6 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 279aafe..e35bc68 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0-apache -ENV NEXTCLOUD_VERSION 24.0.5 +ENV NEXTCLOUD_VERSION 24.0.6 RUN \ apt-get update && \ -- 2.45.2 From 655bee6193d0370d5d6548869a9d1a8e08d68949 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 28 Oct 2022 08:34:39 +0200 Subject: [PATCH 15/22] nextcloud 25 and php 8.1 update --- webservice/Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index e35bc68..4f35a30 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ -FROM php:8.0-apache +FROM php:8.1-apache -ENV NEXTCLOUD_VERSION 24.0.6 +ENV NEXTCLOUD_VERSION 25.0.0 RUN \ apt-get update && \ @@ -67,14 +67,8 @@ RUN \ docker-php-ext-enable apcu # compile imagick from master branch as there isn't any release for php8 yet. -ENV IMAGICK_SHA 448c1cd0d58ba2838b9b6dff71c9b7e70a401b90 RUN \ - curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/${IMAGICK_SHA}.tar.gz &&\ - tar --strip-components=1 -xf /tmp/imagick.tar.gz &&\ - phpize &&\ - ./configure &&\ - make &&\ - make install &&\ + pecl install imagick && \ docker-php-ext-enable imagick # Activate user-defined .htaccess -- 2.45.2 From 37606e9b6c87c79aaf5bbed9427518d42bbf271d Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 4 Nov 2022 08:45:38 +0100 Subject: [PATCH 16/22] update to 25.0.1 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 4f35a30..3993d3f 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.1-apache -ENV NEXTCLOUD_VERSION 25.0.0 +ENV NEXTCLOUD_VERSION 25.0.1 RUN \ apt-get update && \ -- 2.45.2 From 5cba8241aa0d4a3ce42c4e2a633953fb9f635007 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 9 Dec 2022 11:52:31 +0100 Subject: [PATCH 17/22] update nextcloud to 25.0.2 and mariadb to 10.6 --- db/Dockerfile | 2 +- docker-compose.yml.dist | 1 + webservice/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/db/Dockerfile b/db/Dockerfile index ab8364f..01bc313 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:10.5 +FROM mariadb:10.6 ADD innodb.cnf /etc/mysql/mariadb.conf.d/innodb.cnf diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index d13c45e..a3867cc 100644 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -18,6 +18,7 @@ services: - "/nextcloud/db:/var/lib/mysql" environment: - MYSQL_ROOT_PASSWORD=toor + - MARIADB_AUTO_UPGRADE=true networks: - internal diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 3993d3f..fb43e21 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.1-apache -ENV NEXTCLOUD_VERSION 25.0.1 +ENV NEXTCLOUD_VERSION 25.0.2 RUN \ apt-get update && \ -- 2.45.2 From 8f0c8f8eb622790092e659d55f33ecdd18e1d642 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 17 Jan 2023 21:39:44 +0100 Subject: [PATCH 18/22] update nextcloud to 25.0.3 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index fb43e21..bd6c95a 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.1-apache -ENV NEXTCLOUD_VERSION 25.0.2 +ENV NEXTCLOUD_VERSION 25.0.3 RUN \ apt-get update && \ -- 2.45.2 From 33dd2f4101b6e954268373ee7f6f6be118655afe Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 11 Mar 2023 20:43:46 +0100 Subject: [PATCH 19/22] update nextcloud --- webservice/Dockerfile | 2 +- webservice/crontab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index bd6c95a..df7e00c 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.1-apache -ENV NEXTCLOUD_VERSION 25.0.3 +ENV NEXTCLOUD_VERSION 25.0.4 RUN \ apt-get update && \ diff --git a/webservice/crontab b/webservice/crontab index 23f1bb0..f2b483d 100644 --- a/webservice/crontab +++ b/webservice/crontab @@ -3,4 +3,4 @@ SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # Run cron.php every 15 minutes -*/15 * * * * cd /var/www/html && sudo -u www-data php ./cron.php +*/5 * * * * cd /var/www/html && sudo -u www-data php ./cron.php -- 2.45.2 From 69a162e55e40508b6cb50b89b9c24d8014bb8a04 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 May 2023 09:59:40 +0200 Subject: [PATCH 20/22] update nextcloud to 26.0.2 --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index df7e00c..eec332f 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.1-apache -ENV NEXTCLOUD_VERSION 25.0.4 +ENV NEXTCLOUD_VERSION 26.0.2 RUN \ apt-get update && \ -- 2.45.2 From 72b2ab7516b146caecc40a39f12a821d8c1b8fb1 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 1 Jun 2023 15:53:47 +0200 Subject: [PATCH 21/22] add missing apache modules recommended for 26.x --- webservice/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index eec332f..2fd0ac4 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -58,6 +58,8 @@ RUN \ bz2 \ intl \ bcmath \ + sysvsem \ + pcntl \ opcache && \ CFLAGS="-I/usr/src/php" docker-php-ext-install xmlreader -- 2.45.2 From 7c17a5c30d75c690609d4371e01b66d1915de094 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 27 Jun 2023 17:24:28 +0200 Subject: [PATCH 22/22] 26.0.3 update --- webservice/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 2fd0ac4..92eff73 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.1-apache -ENV NEXTCLOUD_VERSION 26.0.2 +ENV NEXTCLOUD_VERSION 26.0.3 RUN \ apt-get update && \ -- 2.45.2