build: close mysql inside the configure step

Signed-off-by: nachoparker <nacho@ownyourbits.com>

5 files changed, 23 insertions, 11 deletions

diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh
index 17cf2f9e..16a26bbf 100644
--- a/bin/ncp/CONFIG/nc-init.sh
+++ b/bin/ncp/CONFIG/nc-init.sh
@@ -26,7 +26,9 @@ configure()
 
   # launch mariadb if not already running
   if ! pgrep -c mysqld &>/dev/null; then
+    echo "Starting mariaDB"
     mysqld &
+    local db_pid=$!
   fi
 
   # wait for mariadb
@@ -198,6 +200,13 @@ EOF
   test -f /usr/local/bin/nextcloud-domain.sh && {
     test -f /.ncp-image || bash /usr/local/bin/nextcloud-domain.sh
   }
+
+  # dettach mysql during the build
+  if [[ "${db_pid}" != "" ]]; then
+    mysqladmin -u root shutdown
+    wait "${db_pid}"
+  fi
+
   echo "NC init done"
 }
 
diff --git a/bin/ncp/CONFIG/nc-nextcloud.sh b/bin/ncp/CONFIG/nc-nextcloud.sh
index 17333bd6..004fc73e 100644
--- a/bin/ncp/CONFIG/nc-nextcloud.sh
+++ b/bin/ncp/CONFIG/nc-nextcloud.sh
@@ -152,6 +152,7 @@ configure()
   if ! pgrep -c mysqld &>/dev/null; then
     echo "Starting mariaDB"
     mysqld &
+    local db_pid=$!
   fi
 
   # wait for mariadb
@@ -259,6 +260,11 @@ EOF
   crontab -u www-data /tmp/crontab_http
   rm /tmp/crontab_http
 
+  # dettach mysql during the build
+  if [[ "${db_pid}" != "" ]]; then
+    mysqladmin -u root shutdown
+    wait "${db_pid}"
+  fi
   echo "Don't forget to run nc-init"
 }
 
diff --git a/build/docker/nextcloud/Dockerfile b/build/docker/nextcloud/Dockerfile
index a20465e2..9da1223b 100644
--- a/build/docker/nextcloud/Dockerfile
+++ b/build/docker/nextcloud/Dockerfile
@@ -33,9 +33,6 @@ run_app_unsafe /nc-nextcloud.sh; \
 mv /var/www/nextcloud /data-ro/nextcloud; \
 ln -s /data-ro/nextcloud /var/www/nextcloud; \
 
-# stop mysqld
-mysqladmin -u root shutdown; \
-
 # package cleanup
 apt-get autoremove -y; \
 apt-get clean; \
diff --git a/build/docker/nextcloudpi/Dockerfile b/build/docker/nextcloudpi/Dockerfile
index 0b7d7cc1..88c737a9 100644
--- a/build/docker/nextcloudpi/Dockerfile
+++ b/build/docker/nextcloudpi/Dockerfile
@@ -13,13 +13,13 @@ SHELL ["/bin/bash", "-c"]
 ENV DOCKERBUILD 1
 
 RUN mkdir -p /tmp/ncp-build
-COPY bin/                 /tmp/ncp-build/bin/
-COPY etc                  /tmp/ncp-build/etc/
-COPY ncp.sh update.sh post-inst.sh    /tmp/ncp-build/
-COPY ncp-web              /tmp/ncp-build/ncp-web/
-COPY ncp-app              /tmp/ncp-build/ncp-app/
-COPY ncp-previewgenerator /tmp/ncp-build/ncp-previewgenerator/
-COPY build/docker         /tmp/ncp-build/build/docker/
+COPY bin/                          /tmp/ncp-build/bin/
+COPY etc                           /tmp/ncp-build/etc/
+COPY ncp-web                       /tmp/ncp-build/ncp-web/
+COPY ncp-app                       /tmp/ncp-build/ncp-app/
+COPY ncp-previewgenerator          /tmp/ncp-build/ncp-previewgenerator/
+COPY build/docker                  /tmp/ncp-build/build/docker/
+COPY ncp.sh update.sh post-inst.sh /tmp/ncp-build/
 COPY etc/ncp-config.d/nc-init.cfg /usr/local/etc/ncp-config.d/nc-init-copy.cfg
 
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
diff --git a/etc/library.sh b/etc/library.sh
index 06405aa8..b7f533b5 100644
--- a/etc/library.sh
+++ b/etc/library.sh
@@ -224,7 +224,7 @@ function run_app_unsafe()
   }
 
   # run
-  configure 2>&1 | tee -a $log
+  (configure) 2>&1 | tee -a $log
   local ret="${PIPESTATUS[0]}"
 
   echo "" >> $log