From 8faa85ef9e421a75fa8b3f1b3e9099d4eb90ab25 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Wed, 17 Mar 2021 00:55:39 +0100
Subject: [PATCH 01/49] Improve doc

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index fe7bb0d..4161e57 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,8 @@
 # My project's README
+
+## Dokku storage mounts
+
+    dokku storage:mount cloud /var/lib/dokku/data/storage/cloud/apps:/var/www/html/apps
+    dokku storage:mount cloud /var/lib/dokku/data/storage/cloud/config:/var/www/html/config
+    dokku storage:mount cloud /var/lib/dokku/data/storage/cloud/data:/var/www/html/data
+

From 910faff3e5d309d0b9fba4a6aafa476a4c3fd09d Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Wed, 17 Mar 2021 00:56:15 +0100
Subject: [PATCH 02/49] Add cron job

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5b49b4b..a57b715 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,10 +29,10 @@ RUN apt-get update \
 #  && echo "apc.enable=1" >> /usr/local/etc/php/glenux-apcu.ini \
 #  && docker-php-ext-enable apcu
 
-#    apt-get install -q -y cron && \
-#     apt-get clean
+RUN apt-get install -q -y cron \
+ && apt-get clean
 
-# RUN echo "*/15 * * * *  root    su -l www-data -s /bin/bash -c 'php -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab
+RUN echo "*/5 * * * *  root    su -l www-data -s /bin/bash -c 'php -d memory_limit=1024M -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab
 
 # CMD cron && apache2-foreground
 

From be924f9cb36d62d61ea80311fc3d744caf754332 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 27 Mar 2021 13:47:31 +0100
Subject: [PATCH 03/49] Raise memory limit & enable cron

---
 Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a57b715..078ca7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,9 +32,13 @@ RUN apt-get update \
 RUN apt-get install -q -y cron \
  && apt-get clean
 
+# Raise memory limit for PHP
+RUN echo "memory_limit=1024M" > /usr/local/etc/php/conf.d/memory-limit.ini
+
+# Add cron task
 RUN echo "*/5 * * * *  root    su -l www-data -s /bin/bash -c 'php -d memory_limit=1024M -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab
 
-# CMD cron && apache2-foreground
+CMD cron && apache2-foreground
 
 # Mandatory for bookmark extension
 # but missing from deb packages

From 966300ef650f9afca9d4904f86b5e6194df236dc Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 27 Mar 2021 15:39:50 +0100
Subject: [PATCH 04/49] Disable cron since it is included by default now

---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 078ca7f..b142fb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,16 +29,16 @@ RUN apt-get update \
 #  && echo "apc.enable=1" >> /usr/local/etc/php/glenux-apcu.ini \
 #  && docker-php-ext-enable apcu
 
-RUN apt-get install -q -y cron \
- && apt-get clean
+## DO NOT install cron since it is included by default now 
+## ref: https://github.com/nextcloud/docker/blob/master/21.0/apache/Dockerfile
+# RUN apt-get install -q -y cron \
+#  && apt-get clean \
+#  && echo "*/5 * * * *  root    su -l www-data -s /bin/bash -c 'php -d memory_limit=1024M -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab
 
 # Raise memory limit for PHP
 RUN echo "memory_limit=1024M" > /usr/local/etc/php/conf.d/memory-limit.ini
 
-# Add cron task
-RUN echo "*/5 * * * *  root    su -l www-data -s /bin/bash -c 'php -d memory_limit=1024M -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab
-
-CMD cron && apache2-foreground
+# CMD cron && apache2-foreground
 
 # Mandatory for bookmark extension
 # but missing from deb packages

From b4fc39a54ec0387013751a2b8acef93e41735949 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 27 Mar 2021 17:01:42 +0100
Subject: [PATCH 05/49] Fix cron (again)

---
 Dockerfile | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b142fb2..123127a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,19 +29,31 @@ RUN apt-get update \
 #  && echo "apc.enable=1" >> /usr/local/etc/php/glenux-apcu.ini \
 #  && docker-php-ext-enable apcu
 
-## DO NOT install cron since it is included by default now 
-## ref: https://github.com/nextcloud/docker/blob/master/21.0/apache/Dockerfile
-# RUN apt-get install -q -y cron \
-#  && apt-get clean \
-#  && echo "*/5 * * * *  root    su -l www-data -s /bin/bash -c 'php -d memory_limit=1024M -f /var/www/html/cron.php' > /dev/null 2>&1" >> /etc/crontab
-
-# Raise memory limit for PHP
-RUN echo "memory_limit=1024M" > /usr/local/etc/php/conf.d/memory-limit.ini
-
-# CMD cron && apache2-foreground
-
 # Mandatory for bookmark extension
 # but missing from deb packages
 # RUN apt-get update \
 # && apt-get install -y php7.3-gmp
 
+
+##
+## Raise memory limit for PHP
+##
+ENV PHP_MEMORY_LIMIT=1024M
+RUN echo "memory_limit=1024M" > /usr/local/etc/php/conf.d/memory-limit.ini
+
+##
+## CRON SETUP
+##
+## Based on https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/cron/apache
+
+RUN apt-get update && apt-get install -y \
+    supervisor \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir /var/log/supervisord /var/run/supervisord
+
+COPY supervisord.conf /etc/supervisord.conf
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
+

From 06115c671ff163dcc9c7dc6250ee5d35a5e9d326 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 27 Mar 2021 17:05:29 +0100
Subject: [PATCH 06/49] Add missing supervisord.conf

---
 supervisord.conf | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 supervisord.conf

diff --git a/supervisord.conf b/supervisord.conf
new file mode 100644
index 0000000..836a08a
--- /dev/null
+++ b/supervisord.conf
@@ -0,0 +1,22 @@
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisord/supervisord.log
+pidfile=/var/run/supervisord/supervisord.pid
+childlogdir=/var/log/supervisord/
+logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
+logfile_backups=10                              ; number of backed up logfiles
+loglevel=error
+
+[program:apache2]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=apache2-foreground
+
+[program:cron]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=/cron.sh

From 5fc3b30937cc9131319ed6372edf877798131005 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 27 Mar 2021 17:08:30 +0100
Subject: [PATCH 07/49] Add support for gmp & ffmpeg & svg

---
 Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 123127a..a7f3b55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,6 +53,19 @@ RUN apt-get update && apt-get install -y \
 
 COPY supervisord.conf /etc/supervisord.conf
 
+##
+## GMP Support (for bookmark extension)
+##
+RUN apt-get update && apt-get install -y libgmp3-dev \
+ && docker-php-ext-install gmp
+
+##
+## SVG & Thumbnail support
+##
+RUN apt-get update && apt-get install -y \
+    libmagickcore-6.q16-6-extra ffmpeg \
+  && rm -rf /var/lib/apt/lists/* \
+
 ENV NEXTCLOUD_UPDATE=1
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]

From 2f1380225839175526f8f6403d69c707e07fa5c0 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 27 Mar 2021 17:17:19 +0100
Subject: [PATCH 08/49] Raise memory limit for cron too

---
 Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a7f3b55..a07e97a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,10 @@ RUN apt-get update \
 ## Raise memory limit for PHP
 ##
 ENV PHP_MEMORY_LIMIT=1024M
-RUN echo "memory_limit=1024M" > /usr/local/etc/php/conf.d/memory-limit.ini
+RUN echo 'memory_limit=1024M' \
+    > /usr/local/etc/php/conf.d/memory-limit.ini \
+ && echo '*/5 * * * * php -d memory_limit=1024M -f /var/www/html/cron.php' \
+    > /var/spool/cron/crontabs/www-data
 
 ##
 ## CRON SETUP
@@ -50,9 +53,9 @@ RUN apt-get update && apt-get install -y \
     supervisor \
   && rm -rf /var/lib/apt/lists/* \
   && mkdir /var/log/supervisord /var/run/supervisord
-
 COPY supervisord.conf /etc/supervisord.conf
 
+
 ##
 ## GMP Support (for bookmark extension)
 ##

From f7624d653e473656aa4811a1f1240d49220ef159 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 27 Mar 2021 17:18:15 +0100
Subject: [PATCH 09/49] Re-organize Dockerfile for better caching

---
 Dockerfile | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a07e97a..ae72ede 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,6 +34,18 @@ RUN apt-get update \
 # RUN apt-get update \
 # && apt-get install -y php7.3-gmp
 
+##
+## GMP Support (for bookmark extension)
+##
+RUN apt-get update && apt-get install -y libgmp3-dev \
+ && docker-php-ext-install gmp
+
+##
+## SVG & Thumbnail support
+##
+RUN apt-get update && apt-get install -y \
+    libmagickcore-6.q16-6-extra ffmpeg \
+  && rm -rf /var/lib/apt/lists/* \
 
 ##
 ## Raise memory limit for PHP
@@ -48,7 +60,7 @@ RUN echo 'memory_limit=1024M' \
 ## CRON SETUP
 ##
 ## Based on https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/cron/apache
-
+##
 RUN apt-get update && apt-get install -y \
     supervisor \
   && rm -rf /var/lib/apt/lists/* \
@@ -56,19 +68,6 @@ RUN apt-get update && apt-get install -y \
 COPY supervisord.conf /etc/supervisord.conf
 
 
-##
-## GMP Support (for bookmark extension)
-##
-RUN apt-get update && apt-get install -y libgmp3-dev \
- && docker-php-ext-install gmp
-
-##
-## SVG & Thumbnail support
-##
-RUN apt-get update && apt-get install -y \
-    libmagickcore-6.q16-6-extra ffmpeg \
-  && rm -rf /var/lib/apt/lists/* \
-
 ENV NEXTCLOUD_UPDATE=1
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]

From 27f2ca56d4d2730393b99a9eb4f84cf23de1278a Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 27 Mar 2021 17:21:31 +0100
Subject: [PATCH 10/49] Remove ffmpeg (too huge)

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ae72ede..8477ecb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,10 +41,10 @@ RUN apt-get update && apt-get install -y libgmp3-dev \
  && docker-php-ext-install gmp
 
 ##
-## SVG & Thumbnail support
+## SVG support
 ##
 RUN apt-get update && apt-get install -y \
-    libmagickcore-6.q16-6-extra ffmpeg \
+    libmagickcore-6.q16-6-extra \
   && rm -rf /var/lib/apt/lists/* \
 
 ##

From 41747f967c6a29f5301c413476b343c135ced3ac Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Fri, 18 Jun 2021 15:32:28 +0200
Subject: [PATCH 11/49] Bump version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8477ecb..c28e68b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@
 # FROM nextcloud:19.0.3-apache
 # FROM nextcloud:20.0.0-apache
 # FROM nextcloud:20.0.5-apache
-FROM nextcloud:21.0.0-apache
+FROM nextcloud:21.0.1-apache
 
 RUN apt-get update \
  && apt-get install -y nano \

From 72aeda38b6bd61ce39afadf7b1f65aeb72a87a4e Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Fri, 18 Jun 2021 16:12:19 +0200
Subject: [PATCH 12/49] Bump version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c28e68b..57a7f33 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@
 # FROM nextcloud:19.0.3-apache
 # FROM nextcloud:20.0.0-apache
 # FROM nextcloud:20.0.5-apache
-FROM nextcloud:21.0.1-apache
+FROM nextcloud:21.0.2-apache
 
 RUN apt-get update \
  && apt-get install -y nano \

From ea3ffb5579b9ac69bdf478fdaa07ea37c5db7bef Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Mon, 12 Jul 2021 08:49:53 +0200
Subject: [PATCH 13/49] Bump to v22.0.0

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 57a7f33..24faf7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,8 @@
 # FROM nextcloud:19.0.3-apache
 # FROM nextcloud:20.0.0-apache
 # FROM nextcloud:20.0.5-apache
-FROM nextcloud:21.0.2-apache
+# FROM nextcloud:21.0.2-apache
+FROM nextcloud:22.0.0-apache
 
 RUN apt-get update \
  && apt-get install -y nano \

From 07468c8649c5675759f0bad2918e72947ce65bb5 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Tue, 9 Nov 2021 15:27:22 +0100
Subject: [PATCH 14/49] Add an empty line for a demo (sorry)

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 24faf7d..cf59b29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update \
  && apt-get install -y nano \
  && apt-get clean
 
+#
 ## Enable REDIS extension
 # RUN pecl channel-update pecl.php.net \
 #  && sh -c "yes '' |  pecl install redis" \

From 9db5e2c0688e164a33d792bcc6757a83b3f1e686 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Tue, 16 Nov 2021 10:35:39 +0100
Subject: [PATCH 15/49] Bump version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cf59b29..b416168 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@
 # FROM nextcloud:20.0.0-apache
 # FROM nextcloud:20.0.5-apache
 # FROM nextcloud:21.0.2-apache
-FROM nextcloud:22.0.0-apache
+FROM nextcloud:22.2-apache
 
 RUN apt-get update \
  && apt-get install -y nano \

From 10cb34fe58120e8847b35653f8e95426a8e79566 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sun, 9 Jan 2022 10:35:30 +0100
Subject: [PATCH 16/49] Bump version

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index b416168..3718011 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@
 # FROM nextcloud:20.0.5-apache
 # FROM nextcloud:21.0.2-apache
 FROM nextcloud:22.2-apache
+# FROM nextcloud:23.0-apache
 
 RUN apt-get update \
  && apt-get install -y nano \

From 2eeee63f6c53147c61f4177c3f877095270b414b Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sun, 9 Jan 2022 13:28:09 +0100
Subject: [PATCH 17/49] Disable supervisor

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3718011..4ccaa8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,5 +73,5 @@ COPY supervisord.conf /etc/supervisord.conf
 
 ENV NEXTCLOUD_UPDATE=1
 
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
+# CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
 

From 4216e6f371fd4913bc87e8c5ad1ac5bef6c2db96 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sun, 9 Jan 2022 15:22:56 +0100
Subject: [PATCH 18/49] Bump version

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4ccaa8d..89f0e7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@
 # FROM nextcloud:20.0.0-apache
 # FROM nextcloud:20.0.5-apache
 # FROM nextcloud:21.0.2-apache
-FROM nextcloud:22.2-apache
-# FROM nextcloud:23.0-apache
+# FROM nextcloud:22.2-apache
+FROM nextcloud:23.0-apache
 
 RUN apt-get update \
  && apt-get install -y nano \
@@ -73,5 +73,5 @@ COPY supervisord.conf /etc/supervisord.conf
 
 ENV NEXTCLOUD_UPDATE=1
 
-# CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
 

From 73579e04ffae78a81c1c8c32d219aa7ed78a8e0f Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Fri, 21 Jan 2022 10:25:25 +0100
Subject: [PATCH 19/49] Add comment for demo

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 89f0e7f..be08a56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,8 @@
 # FROM nextcloud:22.2-apache
 FROM nextcloud:23.0-apache
 
+# This is a stupid comment for a demo (remove later)
+
 RUN apt-get update \
  && apt-get install -y nano \
  && apt-get clean

From d1db5f98570d6f380a27172c8f6caf21b7114397 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Thu, 7 Apr 2022 09:36:25 +0200
Subject: [PATCH 20/49] Bump nextcloud version

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be08a56..100ab94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@
 # FROM nextcloud:20.0.5-apache
 # FROM nextcloud:21.0.2-apache
 # FROM nextcloud:22.2-apache
-FROM nextcloud:23.0-apache
+FROM nextcloud:23.0.2-apache
 
 # This is a stupid comment for a demo (remove later)
 
@@ -50,7 +50,7 @@ RUN apt-get update && apt-get install -y libgmp3-dev \
 ##
 RUN apt-get update && apt-get install -y \
     libmagickcore-6.q16-6-extra \
-  && rm -rf /var/lib/apt/lists/* \
+  && rm -rf /var/lib/apt/lists/*
 
 ##
 ## Raise memory limit for PHP

From f37c9d74141585134269fd3750e59c960a75256f Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Thu, 7 Apr 2022 09:36:33 +0200
Subject: [PATCH 21/49] Add docker-compose.yml

---
 docker-compose.yml | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..13f9047
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,42 @@
+---
+version: "3.4"
+
+services:
+  db:
+    container_name: cloud-db
+    image: postgres:14
+    volumes:
+      - cloud-db-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: cloud-password
+      POSTGRES_USER: cloud-user
+      POSTGRES_DB: cloud-db
+    networks:
+      - cloud-net
+
+  app:
+    container_name: cloud-app
+    build: .
+    image: glenux/nextcloud:23
+    volumes:
+      - cloud-app-data:/var/www/html
+    environment:
+      POSTGRES_PASSWORD: cloud-password
+      POSTGRES_USER: cloud-user
+      POSTGRES_DB: cloud-db
+      POSTGRES_HOST: cloud-db
+      NEXTCLOUD_ADMIN_USER: admin
+      NEXTCLOUD_ADMIN_PASSWORD: "1234"
+    networks:
+      - cloud-net
+    ports:
+      - 8080:80
+
+volumes:
+  cloud-app-data:
+  cloud-db-data:
+
+networks:
+  cloud-net:
+
+#

From 9f7bcbc83d95b7d706740c7ffbe175f568962a9f Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sun, 8 May 2022 13:40:33 +0200
Subject: [PATCH 22/49] Bump to nextcloud 24

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 100ab94..86555ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,8 @@
 # FROM nextcloud:20.0.5-apache
 # FROM nextcloud:21.0.2-apache
 # FROM nextcloud:22.2-apache
-FROM nextcloud:23.0.2-apache
+# FROM nextcloud:23.0.2-apache
+FROM nextcloud:24.0-apache
 
 # This is a stupid comment for a demo (remove later)
 

From 114e0917f55da76a38a25cba5377f8255d51a2a7 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Wed, 29 Jun 2022 16:11:32 +0200
Subject: [PATCH 23/49] Bump version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 86555ae..1c7f1a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@
 # FROM nextcloud:21.0.2-apache
 # FROM nextcloud:22.2-apache
 # FROM nextcloud:23.0.2-apache
-FROM nextcloud:24.0-apache
+FROM nextcloud:24.0.2-apache
 
 # This is a stupid comment for a demo (remove later)
 

From 56c50cd8fbb8440bba5ea8926d9069e2304a1d9c Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 15 Nov 2022 12:33:35 +0100
Subject: [PATCH 24/49] doc: update process

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 4161e57..d40472d 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,12 @@
     dokku storage:mount cloud /var/lib/dokku/data/storage/cloud/config:/var/www/html/config
     dokku storage:mount cloud /var/lib/dokku/data/storage/cloud/data:/var/www/html/data
 
+# Process
+
+1. commit 
+2. push to git repo
+3. run CI/CD
+   * build image
+   * push image to local registry
+4. 
+

From 652ce7a56b713bc515333fe27d876392f13848a7 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 15 Nov 2022 12:33:48 +0100
Subject: [PATCH 25/49] feat: Bump version to 25.0.1

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1c7f1a4..aa88faa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@
 # FROM nextcloud:21.0.2-apache
 # FROM nextcloud:22.2-apache
 # FROM nextcloud:23.0.2-apache
-FROM nextcloud:24.0.2-apache
+# FROM nextcloud:24.0.2-apache
+FROM nextcloud:25.0.1-apache
 
 # This is a stupid comment for a demo (remove later)
 

From 1631b8f07bf1b425144126df14fcc4a768d595fd Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 21 Feb 2023 14:47:21 +0100
Subject: [PATCH 26/49] ci: Add deploy step

---
 .dockerignore |   2 +
 .drone.yml    | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 .dockerignore
 create mode 100644 .drone.yml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..76ab1a8
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.drone.yml
+.git
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..2ab8420
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,101 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: debug
+    image: alpine
+    commands:
+      - 'echo "Repository: glenux/service-nextcloud"'
+      - 'echo "Git commit: ${DRONE_COMMIT_SHA:0:8}"'
+
+  - name: publish:commit_sha
+    image: plugins/docker
+    # pull: never
+    # volumes:
+    #   - name: cache
+    #     path: /stupid
+    environment:
+      DOCKER_REPO: glenux/service-nextcloud
+    settings:
+      username:
+        from_secret: DOCKERHUB_USERNAME
+      password:
+        from_secret: DOCKERHUB_PASSWORD
+      cache_from: "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}"
+      repo: glenux/service-nextcloud
+      tags: "${DRONE_COMMIT_SHA:0:8}"
+      purge: false
+
+  - name: publish:commit_branch
+    image: plugins/docker
+    # volumes:
+    #   - name: cache
+    #     path: /stupid
+    settings:
+      username:
+        from_secret: DOCKERHUB_USERNAME
+      password:
+        from_secret: DOCKERHUB_PASSWORD
+      cache_from: "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}"
+      repo: glenux/service-nextcloud
+      tags: "latest_${DRONE_BRANCH/\\//-}"
+      purge: false
+    when:
+      branch:
+        - "master"
+        - "develop"
+        - "feature/*"
+
+  - name: publish:latest
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKERHUB_USERNAME
+      password:
+        from_secret: DOCKERHUB_PASSWORD
+      cache_from: "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}"
+      repo: glenux/service-nextcloud
+      tags: latest
+      purge: false
+    when:
+      branch:
+        - master
+
+  - name: deploy:dokku
+    image: alpine
+    when:
+      branch:
+        - master
+    environment:
+      SSH_USER:
+        from_secret: SSH_USER
+      SSH_HOST:
+        from_secret: SSH_HOST
+      SSH_PRIVATE_KEY:
+        from_secret: SSH_PRIVATE_KEY
+    commands:
+      - echo $SSH_USER
+      - echo $SSH_HOST
+      - echo $SSH_PRIVATE_KEY
+      - apk update && apk add openssh-client
+      - mkdir -p ~/.ssh && chmod 700 ~/.ssh
+      - echo "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/deploy_key
+      - chmod 600 ~/.ssh/deploy_key
+      - ssh -o StrictHostKeyChecking=no
+            -i ~/.ssh/deploy_key
+            "$SSH_USER@$SSH_HOST"
+            ps:stop social
+      - ssh -o StrictHostKeyChecking=no
+            -i ~/.ssh/deploy_key
+            "$SSH_USER@$SSH_HOST"
+            git:from-image cloud
+            "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}"
+            #
+      - echo "SUCCESS"
+
+# volumes:
+#   - name: cache
+#     temp: {}
+#

From 1b6e8ff336e627bc02a1748f55c87408f1ce09c9 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 21 Feb 2023 14:47:56 +0100
Subject: [PATCH 27/49] feat: Add support for clamdscan

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index aa88faa..2fc499e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ FROM nextcloud:25.0.1-apache
 # This is a stupid comment for a demo (remove later)
 
 RUN apt-get update \
- && apt-get install -y nano \
+ && apt-get install -y clamdscan nano \
  && apt-get clean
 
 #

From e775a048fc2dffd1804a801f43d8b66335a8ec11 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 21 Feb 2023 15:01:25 +0100
Subject: [PATCH 28/49] ci: Remove unwanted dokku ps:stop

---
 .drone.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2ab8420..2e96203 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -83,10 +83,6 @@ steps:
       - mkdir -p ~/.ssh && chmod 700 ~/.ssh
       - echo "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/deploy_key
       - chmod 600 ~/.ssh/deploy_key
-      - ssh -o StrictHostKeyChecking=no
-            -i ~/.ssh/deploy_key
-            "$SSH_USER@$SSH_HOST"
-            ps:stop social
       - ssh -o StrictHostKeyChecking=no
             -i ~/.ssh/deploy_key
             "$SSH_USER@$SSH_HOST"

From 6c7dd1db0d70612338cfff24b35bca3c0bcc3fe4 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 21 Feb 2023 15:18:36 +0100
Subject: [PATCH 29/49] feat: Add support for app.json

---
 Dockerfile | 1 +
 app.json   | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 app.json

diff --git a/Dockerfile b/Dockerfile
index 2fc499e..d5e6d43 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -74,6 +74,7 @@ RUN apt-get update && apt-get install -y \
   && mkdir /var/log/supervisord /var/run/supervisord
 COPY supervisord.conf /etc/supervisord.conf
 
+COPY app.json /app/app.json
 
 ENV NEXTCLOUD_UPDATE=1
 
diff --git a/app.json b/app.json
new file mode 100644
index 0000000..bba7e5b
--- /dev/null
+++ b/app.json
@@ -0,0 +1,7 @@
+{
+  "scripts": {
+    "dokku": {
+      "postdeploy": "pwd && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo SUCCESS"
+    }
+  }
+}

From 98497b95d38c5cafcbaa51bc130adc9084a7ae6b Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Fri, 24 Feb 2023 11:44:36 +0000
Subject: [PATCH 30/49] Bump version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d5e6d43..2f1b91e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@
 # FROM nextcloud:22.2-apache
 # FROM nextcloud:23.0.2-apache
 # FROM nextcloud:24.0.2-apache
-FROM nextcloud:25.0.1-apache
+FROM nextcloud:25.0.4-apache
 
 # This is a stupid comment for a demo (remove later)
 

From 851e4d7715dcca102c4b71affd8966dfca3652cf Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 25 Feb 2023 21:20:53 +0100
Subject: [PATCH 31/49] deploy: Add upgrade command

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index bba7e5b..3da6668 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "dokku": {
-      "postdeploy": "pwd && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo SUCCESS"
+      "postdeploy": "pwd && occ upgrade && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo SUCCESS"
     }
   }
 }

From b7f2c634f3a02688503ac3bf6146cafbf40ca54c Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 25 Feb 2023 21:37:56 +0100
Subject: [PATCH 32/49] deploy: Protect execution

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index 3da6668..c2e33d7 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "dokku": {
-      "postdeploy": "pwd && occ upgrade && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo SUCCESS"
+      "postdeploy": "sh -c 'pwd && occ upgrade && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo SUCCESS'"
     }
   }
 }

From 7241126861d14c396b6d8f7a5a0ee7f4bfcda8e0 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 25 Feb 2023 21:38:41 +0100
Subject: [PATCH 33/49] deploy: Add marker

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index c2e33d7..b1ecd30 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "dokku": {
-      "postdeploy": "sh -c 'pwd && occ upgrade && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo SUCCESS'"
+      "postdeploy": "sh -c 'echo GYR:POSTDEPLOY:START && pwd && occ upgrade && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo GYR:POSTDEPLOY:END'"
     }
   }
 }

From 16b983a2724b3edba26c46f7d9b3ded9822315a3 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 25 Feb 2023 21:58:19 +0100
Subject: [PATCH 34/49] Bump version

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2f1b91e..c14407d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,8 @@
 # FROM nextcloud:22.2-apache
 # FROM nextcloud:23.0.2-apache
 # FROM nextcloud:24.0.2-apache
-FROM nextcloud:25.0.4-apache
+#FROM nextcloud:25.0.4-apache
+FROM nextcloud:25.0.4.1-apache
 
 # This is a stupid comment for a demo (remove later)
 

From d537bdb26315f49cb6bdbd2851f7d010b0cbbc1e Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sat, 25 Feb 2023 22:00:39 +0100
Subject: [PATCH 35/49] Revert version

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c14407d..2f1b91e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,7 @@
 # FROM nextcloud:22.2-apache
 # FROM nextcloud:23.0.2-apache
 # FROM nextcloud:24.0.2-apache
-#FROM nextcloud:25.0.4-apache
-FROM nextcloud:25.0.4.1-apache
+FROM nextcloud:25.0.4-apache
 
 # This is a stupid comment for a demo (remove later)
 

From 8fa702a475f95c0f528f446199b24292097c3fb1 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sun, 26 Feb 2023 00:07:01 +0100
Subject: [PATCH 36/49] deploy: list files

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index b1ecd30..31ae1e9 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "dokku": {
-      "postdeploy": "sh -c 'echo GYR:POSTDEPLOY:START && pwd && occ upgrade && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo GYR:POSTDEPLOY:END'"
+      "postdeploy": "sh -c 'echo GYR:POSTDEPLOY:START && pwd && find . && occ upgrade && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo GYR:POSTDEPLOY:END'"
     }
   }
 }

From 26e64974c34b3ef497398b2d86c9dd418eb1828d Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sun, 26 Feb 2023 00:54:24 +0100
Subject: [PATCH 37/49] deploy: fix deploy script

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index 31ae1e9..23d4c7d 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "dokku": {
-      "postdeploy": "sh -c 'echo GYR:POSTDEPLOY:START && pwd && find . && occ upgrade && occ db:convert-filecache-bigint && occ db:add-missing-indices && echo GYR:POSTDEPLOY:END'"
+      "postdeploy": "sh -c 'echo GYR:POSTDEPLOY:START && pwd && find . -maxdepth 1 && php -d memory_limit=-1 occ upgrade && php -d memory_limit=-1 occ db:convert-filecache-bigint && php -d memory_limit=-1 occ db:add-missing-indices && echo GYR:POSTDEPLOY:END'"
     }
   }
 }

From 7381845b87a3862f2f4eded81434c07f196ed686 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Sun, 26 Feb 2023 01:08:17 +0100
Subject: [PATCH 38/49] deploy: Use postdeploy script

---
 Dockerfile    |  1 +
 app.json      |  2 +-
 postdeploy.sh | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 postdeploy.sh

diff --git a/Dockerfile b/Dockerfile
index 2f1b91e..5e2baae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,6 +75,7 @@ RUN apt-get update && apt-get install -y \
 COPY supervisord.conf /etc/supervisord.conf
 
 COPY app.json /app/app.json
+COPY postdeploy.sh /app/postdeploy.sh
 
 ENV NEXTCLOUD_UPDATE=1
 
diff --git a/app.json b/app.json
index 23d4c7d..9c60d3c 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "dokku": {
-      "postdeploy": "sh -c 'echo GYR:POSTDEPLOY:START && pwd && find . -maxdepth 1 && php -d memory_limit=-1 occ upgrade && php -d memory_limit=-1 occ db:convert-filecache-bigint && php -d memory_limit=-1 occ db:add-missing-indices && echo GYR:POSTDEPLOY:END'"
+      "postdeploy": "su -l -s /bin/sh www-data -c /app/postdeploy.sh"
     }
   }
 }
diff --git a/postdeploy.sh b/postdeploy.sh
new file mode 100755
index 0000000..57ba1e7
--- /dev/null
+++ b/postdeploy.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -u
+set -e
+
+cd /var/www/html
+echo "GYR:POSTDEPLOY:START ($(pwd))"
+find . -maxdepth 1 
+php -d memory_limit=-1 occ upgrade 
+php -d memory_limit=-1 occ db:convert-filecache-bigint 
+php -d memory_limit=-1 occ db:add-missing-indices 
+echo "GYR:POSTDEPLOY:END"
+

From c4ebbb02c81a153fcd0d85e0ad755e03d23ecd1d Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 14 Mar 2023 13:13:11 +0100
Subject: [PATCH 39/49] docker: Update PHP_UPLOAD_LIMIT to 1800M

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 5e2baae..1e9cbd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,6 +58,7 @@ RUN apt-get update && apt-get install -y \
 ## Raise memory limit for PHP
 ##
 ENV PHP_MEMORY_LIMIT=1024M
+ENV PHP_UPLOAD_LIMIT=1800M
 RUN echo 'memory_limit=1024M' \
     > /usr/local/etc/php/conf.d/memory-limit.ini \
  && echo '*/5 * * * * php -d memory_limit=1024M -f /var/www/html/cron.php' \

From 0fccc7d81d0a3836dea621f907af5c8d45a767e6 Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Thu, 23 Mar 2023 08:55:40 +0000
Subject: [PATCH 40/49] Update 'Dockerfile'

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1e9cbd8..6089abf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,9 @@
 # FROM nextcloud:22.2-apache
 # FROM nextcloud:23.0.2-apache
 # FROM nextcloud:24.0.2-apache
-FROM nextcloud:25.0.4-apache
+# FROM nextcloud:25.0.4-apache
+FROM nextcloud:26.0.0-apache
+
 
 # This is a stupid comment for a demo (remove later)
 

From b34bc31f3544c361d3b107be6889683f94ded44c Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Thu, 23 Mar 2023 10:48:03 +0100
Subject: [PATCH 41/49] feat: Add ghostscript for LibreSign app

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1e9cbd8..5129d87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ FROM nextcloud:25.0.4-apache
 # This is a stupid comment for a demo (remove later)
 
 RUN apt-get update \
- && apt-get install -y clamdscan nano \
+ && apt-get install -y clamdscan nano ghostscript \
  && apt-get clean
 
 #

From 209621cb89fa45dd77d9472c71f43bb7db884373 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Thu, 23 Mar 2023 11:19:25 +0100
Subject: [PATCH 42/49] fix: Change imagemagick policy for pdfs

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3c332f5..8bc89e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,12 +50,15 @@ RUN apt-get update && apt-get install -y libgmp3-dev \
  && docker-php-ext-install gmp
 
 ##
-## SVG support
+## SVG and LibreSign support
 ##
 RUN apt-get update && apt-get install -y \
     libmagickcore-6.q16-6-extra \
   && rm -rf /var/lib/apt/lists/*
 
+RUN sed -i'' 's|.*<policy domain="coder".*"PDF".*|<policy domain="coder" rights="read \| write" pattern="PDF" />|g' \
+        /etc/ImageMagick-6/policy.xml
+
 ##
 ## Raise memory limit for PHP
 ##

From ad066ee9b08b09345f2e390c6bda944398519cbd Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Fri, 24 Mar 2023 11:58:07 +0100
Subject: [PATCH 43/49] fix: Double opcache memory_consumption size

---
 Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8bc89e6..5173964 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,16 +64,19 @@ RUN sed -i'' 's|.*<policy domain="coder".*"PDF".*|<policy domain="coder" rights=
 ##
 ENV PHP_MEMORY_LIMIT=1024M
 ENV PHP_UPLOAD_LIMIT=1800M
-RUN echo 'memory_limit=1024M' \
-    > /usr/local/etc/php/conf.d/memory-limit.ini \
- && echo '*/5 * * * * php -d memory_limit=1024M -f /var/www/html/cron.php' \
-    > /var/spool/cron/crontabs/www-data
+RUN echo '[opcache]' > /usr/local/etc/php/conf.d/opcache.ini \
+ && echo 'opcache.memory_consumption=256' >> /usr/local/etc/php/conf.d/opcache.ini \
+ && echo '[PHP]' > /usr/local/etc/php/conf.d/memory-limit.ini \
+ && echo 'memory_limit=1024M' >> /usr/local/etc/php/conf.d/memory-limit.ini
 
 ##
 ## CRON SETUP
 ##
 ## Based on https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/cron/apache
 ##
+RUN echo '*/5 * * * * php -d memory_limit=1024M -f /var/www/html/cron.php' \
+    > /var/spool/cron/crontabs/www-data
+
 RUN apt-get update && apt-get install -y \
     supervisor \
   && rm -rf /var/lib/apt/lists/* \

From 897b6b923d56db819d3a3021a5fe95259dc4cf17 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Fri, 24 Mar 2023 12:05:49 +0100
Subject: [PATCH 44/49] feat: Add nginx.conf.d for dokku

---
 nginx.conf.d/dav.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 nginx.conf.d/dav.conf

diff --git a/nginx.conf.d/dav.conf b/nginx.conf.d/dav.conf
new file mode 100644
index 0000000..cc89126
--- /dev/null
+++ b/nginx.conf.d/dav.conf
@@ -0,0 +1,2 @@
+rewrite ^/\.well-known/carddav https://$server_name/remote.php/dav/ permanent;
+rewrite ^/\.well-known/caldav https://$server_name/remote.php/dav/ permanent;

From b050ce4c9c47b5e7ab700298ab47bef3e17ac904 Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Thu, 6 Jul 2023 10:11:37 +0000
Subject: [PATCH 45/49] Bump version to 26.0.2

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5173964..bdbb7e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@
 # FROM nextcloud:23.0.2-apache
 # FROM nextcloud:24.0.2-apache
 # FROM nextcloud:25.0.4-apache
-FROM nextcloud:26.0.0-apache
+FROM nextcloud:26.0.2-apache
 
 
 # This is a stupid comment for a demo (remove later)

From c6d94701a8524510a1e048894c7d3dfcd1bbd829 Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Thu, 31 Aug 2023 10:15:57 +0000
Subject: [PATCH 46/49] Bump version to 27.0.2

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bdbb7e0..f00095f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,8 @@
 # FROM nextcloud:23.0.2-apache
 # FROM nextcloud:24.0.2-apache
 # FROM nextcloud:25.0.4-apache
-FROM nextcloud:26.0.2-apache
+# FROM nextcloud:26.0.2-apache
+FROM nextcloud:27.0.2-apache
 
 
 # This is a stupid comment for a demo (remove later)

From c5d9627558c4896d0aabb6418dfc4ccfa953791f Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Thu, 31 Aug 2023 10:17:46 +0000
Subject: [PATCH 47/49] docs: Add CI/CD badge

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d40472d..438afed 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
-# My project's README
+
+[![Build Status](https://cicd.apps.glenux.net/api/badges/glenux-opencontainers/service-nextcloud/status.svg)](https://cicd.apps.glenux.net/glenux-opencontainers/service-nextcloud)
+
+# Glenux OpenContainers : Service Nextcloud
 
 ## Dokku storage mounts
 

From b6ce7a67b68394b8c271f5c1e52dbf32f10b4089 Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Fri, 6 Oct 2023 08:08:20 +0000
Subject: [PATCH 48/49] Update Dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f00095f..f3e4e37 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,8 @@
 # FROM nextcloud:24.0.2-apache
 # FROM nextcloud:25.0.4-apache
 # FROM nextcloud:26.0.2-apache
-FROM nextcloud:27.0.2-apache
+# FROM nextcloud:27.0.2-apache
+FROM nextcloud:27.1.2-apache
 
 
 # This is a stupid comment for a demo (remove later)

From e92c32c2f6189998eacc3dec29c5364a280b52ce Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Fri, 6 Oct 2023 08:29:41 +0000
Subject: [PATCH 49/49] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f3e4e37..d188c81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # FROM nextcloud:25.0.4-apache
 # FROM nextcloud:26.0.2-apache
 # FROM nextcloud:27.0.2-apache
-FROM nextcloud:27.1.2-apache
+FROM nextcloud:27.1.1-apache
 
 
 # This is a stupid comment for a demo (remove later)