From 47a9cafc8a23f4fea7382f222d0c2334aa62ab1e Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Wed, 26 Jul 2017 22:05:51 +0200
Subject: nc-nextcloud: fixes for docker build process

---
 etc/nextcloudpi-config.d/nc-nextcloud.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/nextcloudpi-config.d/nc-nextcloud.sh b/etc/nextcloudpi-config.d/nc-nextcloud.sh
index d1c8cd73..1f856f57 100644
--- a/etc/nextcloudpi-config.d/nc-nextcloud.sh
+++ b/etc/nextcloudpi-config.d/nc-nextcloud.sh
@@ -47,8 +47,14 @@ install() { :; }
 configure()
 {
   ## RE-CREATE DATABASE TABLE 
+  echo "Starting mariaDB"
+
+  # launch mariadb if not already running (for docker build)
+  pgrep -x mysqld &>/dev/null || { mysqld & }
 
   # wait for mariadb
+  pgrep -x mysqld &>/dev/null || { echo "mariaDB process not found"; return 1; }
+
   while :; do
     [[ -S /var/run/mysqld/mysqld.sock ]] && break
     sleep 0.5
@@ -172,8 +178,6 @@ EOF
   crontab -u www-data /tmp/crontab_http
   rm /tmp/crontab_http
   
-  systemctl start apache2
-
   echo "Don't forget to run nc-init"
 }
 
-- 
cgit v1.2.3