From 06c07d33ee3a3154e41a3d7eca4fd778e0400267 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Thu, 24 May 2018 19:28:28 +0200
Subject: Rework raspbian build system

---
 docker-armhf/nextcloud/Dockerfile     |  5 +----
 docker-armhf/nextcloudplus/Dockerfile | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'docker-armhf')

diff --git a/docker-armhf/nextcloud/Dockerfile b/docker-armhf/nextcloud/Dockerfile
index 1220909e..3002fbe7 100644
--- a/docker-armhf/nextcloud/Dockerfile
+++ b/docker-armhf/nextcloud/Dockerfile
@@ -32,10 +32,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 
 # specific cleanup
 apt-get purge -y wget ca-certificates; \
-rm /nc-nextcloud.sh; \
-sed -i -E "s/^requirepass .*/requirepass default/" /etc/redis/redis.conf; \
-echo -e "[client]\npassword=default" > /root/.my.cnf; \
-chmod 600 /root/.my.cnf
+rm /nc-nextcloud.sh
 
 COPY docker-common/nextcloud/020nextcloud /etc/services-enabled.d/
 COPY bin/ncp-provisioning.sh /usr/local/bin/
diff --git a/docker-armhf/nextcloudplus/Dockerfile b/docker-armhf/nextcloudplus/Dockerfile
index 652e2ac7..01cc58d9 100644
--- a/docker-armhf/nextcloudplus/Dockerfile
+++ b/docker-armhf/nextcloudplus/Dockerfile
@@ -6,7 +6,7 @@ SHELL ["/bin/bash", "-c"]
 
 ENV DOCKERBUILD 1
 
-COPY nextcloudplus.sh /usr/local/etc/
+COPY ncp.sh /usr/local/etc/
 
 RUN \
 
@@ -19,17 +19,22 @@ touch /.docker-image; \
 apt-get update; \
 apt-get install --no-install-recommends -y wget ca-certificates; \
       
-# install nextcloudplus
+# install nextcloudpi
 source /usr/local/etc/library.sh; \
 set +x; \
 cd /usr/local/etc/; \
-install_script nextcloudplus.sh; \
+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; \
 
 # specific cleanup
-rm /usr/local/etc/nextcloudplus.sh; \
+rm /usr/local/etc/ncp.sh; \
 rm /.ncp-image; \
 
 # remove wizard for now
@@ -76,7 +81,7 @@ rm -rf /usr/share/doc/*; \
 rm -f /var/log/alternatives.log /var/log/apt/*; \
 rm /var/cache/debconf/*-old; 
 
-COPY docker-common/nextcloudplus/000ncp /etc/services-enabled.d/
+COPY docker-common/nextcloudpi/000ncp /etc/services-enabled.d/
 
 # 4443 - ncp-web
 EXPOSE 80 443 4443
-- 
cgit v1.2.3