Merge branch '156-docker' into 'master'

Resolve "Started Extra Services restart on OS reboot"

Closes #156

See merge request cyber5k/mistborn!72

scripts/conf/docker-daemon.json

@@ -0,0 +1,3 @@
+{
+    "shutdown-timeout": 60 
+}

scripts/services/Mistborn-bitwarden.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-guacamole.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-homeassistant.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-jellyfin.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-jitsi.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-nextcloud.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-onlyoffice.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-rocketchat.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-syncthing.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/services/Mistborn-tor.service

@@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
 
 [Service]
 Restart=always
+RestartSec=15
 User=root
 Group=docker
 PermissionsStartOnly=true

scripts/subinstallers/docker.sh

@@ -18,3 +18,6 @@ fi
 if [ ! -f /usr/local/bin/docker-compose ]; then
     sudo -E ln -s $(which docker-compose) /usr/local/bin/docker-compose
 fi
+
+# daemon.json
+#source ./scripts/subinstallers/docker_daemon.sh

scripts/subinstallers/docker_daemon.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# daemon.json
+if [ ! -f /etc/docker/daemon.json ]; then
+    sudo -E cp ./scripts/conf/docker-daemon.json /etc/docker/daemon.json
+    sudo -E systemctl restart docker
+fi

scripts/update.sh

@@ -18,6 +18,13 @@ sudo mistborn-cli pullbuild
 sudo docker container prune -f
 sudo docker image prune -f
 
+
+# RESTART
+
 sudo systemctl stop Mistborn-base
+
+# docker daemon
+#source ./scripts/subinstallers/docker_daemon.sh
+
 sudo systemctl restart Mistborn-setup
 sudo systemctl restart Mistborn-base

scripts/wrappers/mistborn_docker.sh

@@ -32,4 +32,15 @@ else
     echo "No init script. Proceeding."
 fi
 
-exec "$@"
+# ensure base is up and listening
+echo "Waiting for Mistborn-base to finish starting up..."
+
+while ! nc -z 10.2.3.1 5000; do
+    WAIT_TIME=$((5 + $RANDOM % 15))
+    echo "Waiting ${WAIT_TIME} seconds for Mistborn-base..."
+    sleep ${WAIT_TIME}
+done
+
+echo "Mistborn-base is running"
+
+exec "$@"