From 612b4325fb763df6e25e2c9891429bb8a4feb707 Mon Sep 17 00:00:00 2001
From: Chris <bsod@zom.bi>
Date: Tue, 23 Feb 2021 17:19:32 +0100
Subject: [PATCH 1/4] bump version number

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

diff --git a/webservice/Dockerfile b/webservice/Dockerfile
index b4a6ac1..d9e6197 100644
--- a/webservice/Dockerfile
+++ b/webservice/Dockerfile
@@ -1,6 +1,6 @@
-FROM php:7.4-apache
+FROM php:8.0-apache
 
-ENV NEXTCLOUD_VERSION 20.0.7
+ENV NEXTCLOUD_VERSION 21.0.0
 
 RUN \
     apt-get update && \
-- 
2.45.2


From ff1c5abf6d22d56cc6db08669929f25101814726 Mon Sep 17 00:00:00 2001
From: Chris <bsod@zom.bi>
Date: Tue, 23 Feb 2021 17:20:10 +0100
Subject: [PATCH 2/4] remove plugins which aren't required anymore with php8

---
 webservice/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webservice/Dockerfile b/webservice/Dockerfile
index d9e6197..91149a5 100644
--- a/webservice/Dockerfile
+++ b/webservice/Dockerfile
@@ -51,8 +51,6 @@ RUN \
         dom \
         gd \
         gmp \
-        iconv \
-        json \
         xmlwriter \
         zip \
         pdo_mysql \
-- 
2.45.2


From e0b4753db45fbc21de2f1e36743dc7ac25488f85 Mon Sep 17 00:00:00 2001
From: Chris <bsod@zom.bi>
Date: Tue, 23 Feb 2021 17:20:37 +0100
Subject: [PATCH 3/4] install imagemagick from git

---
 webservice/Dockerfile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/webservice/Dockerfile b/webservice/Dockerfile
index 91149a5..5840313 100644
--- a/webservice/Dockerfile
+++ b/webservice/Dockerfile
@@ -62,9 +62,20 @@ RUN \
     CFLAGS="-I/usr/src/php" docker-php-ext-install xmlreader
 
 RUN \
-    pecl install -o -f apcu imagick-beta && \
+    pecl install -o -f apcu && \
     rm -rf /tmp/pear && \
-    docker-php-ext-enable apcu imagick
+    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 &&\
+    docker-php-ext-enable imagick
 
 # Activate user-defined .htaccess
 RUN \
-- 
2.45.2


From 6cf972a6be739b7dfa7d966d9c32fde3319d1f0e Mon Sep 17 00:00:00 2001
From: Chris <bsod@zom.bi>
Date: Tue, 23 Feb 2021 17:22:07 +0100
Subject: [PATCH 4/4] enable apc for cli to fix OOM issue on occ

---
 webservice/nextcloud_php.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webservice/nextcloud_php.ini b/webservice/nextcloud_php.ini
index 6b9f48e..80c0759 100644
--- a/webservice/nextcloud_php.ini
+++ b/webservice/nextcloud_php.ini
@@ -7,3 +7,6 @@ opcache.save_comments=1
 opcache.revalidate_freq=1
 
 memory_limit = 1G
+
+apc.enable_cli=1
+apc.enable=1
-- 
2.45.2