From 91a85ab8f4083039645cc29ca5f576da82d3f814 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Tue, 19 Jun 2018 06:40:51 +0200
Subject: docker: build fixes (shutdown mysql, letsencrypt cert dir)

---
 docker-armhf/lamp/Dockerfile        | 3 +++
 docker-armhf/nextcloudpi/Dockerfile | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'docker-armhf')

diff --git a/docker-armhf/lamp/Dockerfile b/docker-armhf/lamp/Dockerfile
index 69f03468..d5a9e50a 100644
--- a/docker-armhf/lamp/Dockerfile
+++ b/docker-armhf/lamp/Dockerfile
@@ -15,6 +15,9 @@ source /usr/local/etc/library.sh; \
 set +x; \
 install_script /usr/local/etc/lamp.sh; \
 
+# stop mysqld
+mysqladmin -u root shutdown; \
+
 # mariaDB fixups (move database to /data-ro, which will be in a persistent volume)
 mkdir -p /data-ro /data; \
 mv /var/lib/mysql /data-ro/database; \
diff --git a/docker-armhf/nextcloudpi/Dockerfile b/docker-armhf/nextcloudpi/Dockerfile
index 1c3ccdc8..f6176074 100644
--- a/docker-armhf/nextcloudpi/Dockerfile
+++ b/docker-armhf/nextcloudpi/Dockerfile
@@ -25,11 +25,6 @@ set +x; \
 cd /usr/local/etc/; \
 install_script ncp.sh; \
 
-# stop mysqld and redis
-mysqladmin -u root shutdown; \
-kill $( cat /run/redis/redis-server.pid ); \
-kill $( cat /run/crond.pid ); \
-
 # fix default paths
 sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \
 
-- 
cgit v1.2.3