Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/nextcloudpi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornachoparker <nacho@ownyourbits.com>2018-06-19 07:40:51 +0300
committernachoparker <nacho@ownyourbits.com>2018-06-19 07:40:51 +0300
commit91a85ab8f4083039645cc29ca5f576da82d3f814 (patch)
treed734da5979409557f5e48b48ea16058f6b9bea41 /docker-armhf
parent9637502da7a4d845597322233412e47c5594d532 (diff)
docker: build fixes (shutdown mysql, letsencrypt cert dir)
Diffstat (limited to 'docker-armhf')
-rw-r--r--docker-armhf/lamp/Dockerfile3
-rw-r--r--docker-armhf/nextcloudpi/Dockerfile5
2 files changed, 3 insertions, 5 deletions
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; \