docker: add update-rc.d function

8 files changed, 28 insertions, 8 deletions

diff --git a/docker-armhf/debian-ncp/Dockerfile b/docker-armhf/debian-ncp/Dockerfile
index bf37a275..54ef9859 100644
--- a/docker-armhf/debian-ncp/Dockerfile
+++ b/docker-armhf/debian-ncp/Dockerfile
@@ -4,6 +4,6 @@ MAINTAINER Ignacio Núñez Hernanz <nacho@ownyourbits.com>
 
 CMD /bin/bash
 
-RUN mkdir -p /etc/services.d
+RUN mkdir -p /etc/services-available.d  /etc/services-enabled.d
 
 COPY docker/debian-ncp/run-parts.sh /
diff --git a/docker-armhf/debian-ncp/run-parts.sh b/docker-armhf/debian-ncp/run-parts.sh
index dee4fe61..44336060 100755
--- a/docker-armhf/debian-ncp/run-parts.sh
+++ b/docker-armhf/debian-ncp/run-parts.sh
@@ -2,16 +2,36 @@
 
 cleanup()
 {
-  for file in $( ls -1rv /etc/services.d ); do
-    /etc/services.d/"$file" stop "$1"
+  for file in $( ls -1rv /etc/services-enabled.d ); do
+    /etc/services-enabled.d/"$file" stop "$1"
   done
   exit
 }
 
 trap cleanup SIGTERM
 
-for file in $( ls -1v /etc/services.d ); do
-  /etc/services.d/"$file" start "$1"
+cat > /usr/local/sbin/update-rc.d <<'EOF'
+#!/bin/bash
+FILE=/etc/services-available.d/???"$1"
+
+test -f $FILE || {
+  echo "$1 doesn't exist"
+  exit 1
+}
+
+[[ "$2" == "enable" ]] && {
+  ln -s $FILE /etc/services-enabled.d/$( basename $FILE )
+  echo "enabled $1"
+  exit 0
+}
+
+rm -f /etc/services-enabled.d/$( basename $FILE )
+echo "disabled $1"
+EOF
+chmod +x /usr/local/sbin/update-rc.d
+
+for file in $( ls -1v /etc/services-enabled.d ); do
+  /etc/services-enabled.d/"$file" start "$1"
 done
 
 echo "Init done"
diff --git a/docker-armhf/lamp/010-lamp-run.sh b/docker-armhf/lamp/010lamp
index 9552d848..9552d848 100755
--- a/docker-armhf/lamp/010-lamp-run.sh
+++ b/docker-armhf/lamp/010lamp
diff --git a/docker-armhf/lamp/Dockerfile b/docker-armhf/lamp/Dockerfile
index 4b672951..30f96f33 100644
--- a/docker-armhf/lamp/Dockerfile
+++ b/docker-armhf/lamp/Dockerfile
@@ -33,7 +33,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 rm /data/database/ib_logfile*; \
 rm /usr/local/etc/lamp.sh
 
-COPY docker/lamp/010-lamp-run.sh /etc/services.d/
+COPY docker/lamp/010lamp /etc/services-enabled.d/
 
 ENTRYPOINT ["/run-parts.sh"]
 
diff --git a/docker-armhf/nextcloud/020-nextcloud-run.sh b/docker-armhf/nextcloud/020nextcloud
index 48076ad2..48076ad2 100755
--- a/docker-armhf/nextcloud/020-nextcloud-run.sh
+++ b/docker-armhf/nextcloud/020nextcloud
diff --git a/docker-armhf/nextcloud/Dockerfile b/docker-armhf/nextcloud/Dockerfile
index f8c42fa3..9dc54663 100644
--- a/docker-armhf/nextcloud/Dockerfile
+++ b/docker-armhf/nextcloud/Dockerfile
@@ -33,4 +33,4 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 apt-get purge -y wget ca-certificates; \
 rm /usr/local/etc/nc-nextcloud.sh
 
-COPY docker/nextcloud/020-nextcloud-run.sh /etc/services.d/
+COPY docker/nextcloud/020nextcloud /etc/services-enabled.d/
diff --git a/docker-armhf/nextcloudpi/000-ncp-run.sh b/docker-armhf/nextcloudpi/000ncp
index 6a4d2d2e..6a4d2d2e 100755
--- a/docker-armhf/nextcloudpi/000-ncp-run.sh
+++ b/docker-armhf/nextcloudpi/000ncp
diff --git a/docker-armhf/nextcloudpi/Dockerfile b/docker-armhf/nextcloudpi/Dockerfile
index 3be71f31..7458eebf 100644
--- a/docker-armhf/nextcloudpi/Dockerfile
+++ b/docker-armhf/nextcloudpi/Dockerfile
@@ -68,7 +68,7 @@ rm -rf /usr/share/doc/*; \
 rm -f /var/log/alternatives.log /var/log/apt/*; \
 rm /var/cache/debconf/*-old; 
 
-COPY docker/nextcloudpi/000-ncp-run.sh /etc/services.d/
+COPY docker/nextcloudpi/000ncp /etc/services-enabled.d/
 
 # 4443 - ncp-web
 EXPOSE 80 443 4443