From 3c460c8edcc41ee4fa6b1b8527db6a2c04ed98ca Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 16 Apr 2019 16:56:15 +0200
Subject: [PATCH] Fix Nextcloud installation

---
 scripts/base.sh                                  |  1 +
 scripts/postinstall.sh                           | 14 +-------------
 scripts/show-info.sh                             |  4 ----
 templates/docker-compose/docker-compose-base.yml |  2 +-
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/scripts/base.sh b/scripts/base.sh
index 8fa0952..9736212 100755
--- a/scripts/base.sh
+++ b/scripts/base.sh
@@ -14,6 +14,7 @@ DBA_USER=$(grep ^DBA_USER= "$ENVFILE" | awk -F= '{ print $NF }')
 DBA_PASSWORD=$(grep ^DBA_PASSWORD= "$ENVFILE" | awk -F= '{ print $NF }')
 
 NEXTCLOUD_ADMIN_USER=$(grep ^NEXTCLOUD_ADMIN_USER= "$ENVFILE" | awk -F= '{ print $NF }')
+NEXTCLOUD_ADMIN_PASSWORD=$(grep ^NEXTCLOUD_ADMIN_PASSWORD= "$ENVFILE" | awk -F= '{ print $NF }')
 
 MYSQL_DATABASE_NC=$(grep ^MYSQL_DATABASE_NC= "$ENVFILE" | awk -F= '{ print $NF }')
 MYSQL_USER_NC=$(grep ^MYSQL_USER_NC= "$ENVFILE" | awk -F= '{ print $NF }')
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index 796c61d..5641c11 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -3,19 +3,7 @@ set -e
 
 source /mnt/repo-base/scripts/base.sh
 
-# We need to wait until both the config exists and occ works. If we only do one of these, it might
-# still not work.
-printf "Waiting for Nextcloud to be started"
-while [ ! -f /mnt/repo-base/volumes/nextcloud/config/config.php ]
-do
-    printf "."
-    sleep 0.1
-done
-while docker-compose exec -T --user www-data nextcloud php occ | grep -q "Nextcloud is not installed";
-do
-    printf "."
-    sleep 0.1
-done
+docker-compose exec --user www-data nextcloud php occ maintenance:install --admin-user="$NEXTCLOUD_ADMIN_USER" --admin-pass="$NEXTCLOUD_ADMIN_PASSWORD" --admin-email="$ALT_EMAIL"
 
 echo "Tweaking nextcloud config"
 sed -i "s/localhost/$DOMAIN/g" /mnt/repo-base/volumes/nextcloud/config/config.php
diff --git a/scripts/show-info.sh b/scripts/show-info.sh
index 63de66b..fbbe684 100755
--- a/scripts/show-info.sh
+++ b/scripts/show-info.sh
@@ -10,10 +10,6 @@ NEXTCLOUD_UI=$(grep server_name $(grep -l nextcloud:80 /mnt/repo-base/config-dyn
 NEXTCLOUD_ADMIN_USER=$(grep ^NEXTCLOUD_ADMIN_USER= "$ENVFILE" | awk -F= '{ print $NF }')
 NEXTCLOUD_ADMIN_PASSWORD=$(grep ^NEXTCLOUD_ADMIN_PASSWORD= "$ENVFILE" | awk -F= '{ print $NF }')
 
-DBA_UI=$(grep server_name $(grep -l pma:80 /mnt/repo-base/config-dynamic/nginx/sites-enabled/*.conf) | sort -u | head -n1 | awk '{ print $2 }' | sed 's/;$//g')
-DBA_USER=$(grep ^DBA_USER= "$ENVFILE"  | awk -F= '{ print $NF }')
-DBA_PASSWORD=$(grep ^DBA_PASSWORD= "$ENVFILE"  | awk -F= '{ print $NF }')
-
 POSTFIX_UI=$(grep server_name $(grep -l postfixadmin:8888 /mnt/repo-base/config-dynamic/nginx/sites-enabled/*.conf) | sort -u | head -n1 | awk '{ print $2 }' | sed 's/;$//g')
 POSTFIX_USER=$(grep ALT_EMAIL= "$ENVFILE"  | awk -F= '{ print $NF }')
 POSTFIX_PASSWORD=$(grep PFA_SUPERADMIN_PASSWORD= "$ENVFILE"  | awk -F= '{ print $NF }')
diff --git a/templates/docker-compose/docker-compose-base.yml b/templates/docker-compose/docker-compose-base.yml
index 27ccf8f..38aaed9 100644
--- a/templates/docker-compose/docker-compose-base.yml
+++ b/templates/docker-compose/docker-compose-base.yml
@@ -99,7 +99,7 @@ services:
               - mariadb
 
   nextcloud:
-    image: nextcloud:15.0.5
+    image: nextcloud:15.0.7
     container_name: nextcloud
     environment:
       - MYSQL_DATABASE=${MYSQL_DATABASE_NC}
-- 
GitLab