From aadf624257ec7b2516a125f437bf886ea81d03e0 Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Tue, 30 Nov 2021 12:50:08 +0100
Subject: [PATCH] add the app into the container and upgrade to 23

Signed-off-by: szaimen <szaimen@e.mail.de>
---
 Containers/nextcloud/Dockerfile    | 9 ++++++++-
 Containers/nextcloud/entrypoint.sh | 7 +++++++
 app/readme.md                      | 2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile
index 06a6c26e..20b646c3 100644
--- a/Containers/nextcloud/Dockerfile
+++ b/Containers/nextcloud/Dockerfile
@@ -109,7 +109,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 22.2.3
+ENV NEXTCLOUD_VERSION 23.0.0
 
 RUN set -ex; \
     fetchDeps=" \
@@ -216,6 +216,13 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
+RUN rm -rf /tmp/nextcloud-aio && \
+    mkdir -p /tmp/nextcloud-aio && \
+    cd /tmp/nextcloud-aio && \
+    git clone https://github.com/nextcloud/all-in-one.git .; \
+    mkdir -p /usr/src/nextcloud/apps/nextcloud-aio; \
+    cp -r ./app/* /usr/src/nextcloud/apps/nextcloud-aio/
+
 RUN chown www-data:root -R /usr/src && \
     chown www-data:root -R /usr/local/etc/php/conf.d && \
     chown www-data:root -R /var/log/supervisord/ && \
diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh
index 1163e8ec..950d1929 100644
--- a/Containers/nextcloud/entrypoint.sh
+++ b/Containers/nextcloud/entrypoint.sh
@@ -217,6 +217,13 @@ php /var/www/html/occ config:system:set overwrite.cli.url --value="https://$NC_D
 php /var/www/html/occ config:system:set htaccess.RewriteBase --value="/"
 php /var/www/html/occ maintenance:update:htaccess
 
+# AIO app
+if [ "$(php /var/www/html/occ config:app:get nextcloud-aio enabled)" = "" ]; then
+    php /var/www/html/occ app:enable nextcloud-aio
+elif [ "$(php /var/www/html/occ config:app:get nextcloud-aio enabled)" = "no" ]; then
+    php /var/www/html/occ app:enable nextcloud-aio
+fi
+
 # Notify push
 if ! [ -d "/var/www/html/custom_apps/notify_push" ]; then
     php /var/www/html/occ app:install notify_push
diff --git a/app/readme.md b/app/readme.md
index ab277b5c..366d6337 100644
--- a/app/readme.md
+++ b/app/readme.md
@@ -4,4 +4,4 @@ Please note that in order to check if an app is already downloaded
 Nextcloud will look for a folder with the same name as the app.
 
 Therefore you need to add the app to one of the app directories
-naming the directory `docker-aio`.
+naming the directory `nextcloud-aio`.