From ad309888818c4d430989d575b7b00d8d652708bb Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@targaryen.house>
Date: Thu, 25 Mar 2021 17:31:08 +0100
Subject: [PATCH] Nextcloud 21 + PHP 8.0

---
 Dockerfile.19 => Dockerfile.21 | 8 ++------
 README.md                      | 4 ++--
 rootfs/php/conf.d/apcu.ini     | 1 +
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename Dockerfile.19 => Dockerfile.21 (93%)

diff --git a/Dockerfile.19 b/Dockerfile.21
similarity index 93%
rename from Dockerfile.19
rename to Dockerfile.21
index 8166d84..0006c42 100644
--- a/Dockerfile.19
+++ b/Dockerfile.21
@@ -1,6 +1,6 @@
-FROM wonderfall/nginx-php:7.4
+FROM wonderfall/nginx-php:8.0
 
-ARG NEXTCLOUD_VERSION=19.0.9
+ARG NEXTCLOUD_VERSION=21.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -24,22 +24,18 @@ RUN apk -U upgrade \
     pcre-dev \
     libtool \
     samba-dev \
-    imagemagick-dev \
  && apk add \
     libressl \
     ca-certificates \
     libsmbclient \
     tzdata \
-    imagemagick \
     ffmpeg \
  && pecl install \
     smbclient \
     apcu \
     redis \
-    imagick \
  && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
  && echo "extension=redis.so" > /php/conf.d/redis.ini \
- && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
diff --git a/README.md b/README.md
index 6ef8f88..23421f2 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,8 @@ As many images from the time it was first made, this image follows the principle
 
 ### Tags
 - **latest** : latest stable version.
-- **20.0** : latest 20.0.x version (stable, recommended)
-- **19.0** : latest 19.0.x version (old stable)
+- **21.0** : latest 21.0.x version (stable, recommended)
+- **20.0** : latest 20.0.x version (old stable)
 
 Since this project should suit my needs, I'll only maintain the latest stable version available.
 
diff --git a/rootfs/php/conf.d/apcu.ini b/rootfs/php/conf.d/apcu.ini
index 1bf9b49..6f3243a 100644
--- a/rootfs/php/conf.d/apcu.ini
+++ b/rootfs/php/conf.d/apcu.ini
@@ -2,3 +2,4 @@ extension=apcu.so
 apc.enabled=1
 apc.shm_size=<APC_SHM_SIZE>
 apc.ttl=7200
+apc.enable_cli=1