Merge pull request #1665 from yubiuser/s6-notifyoncheck

Use s6-notifyoncheck to check for services startup readiness.

(Thanks for this. Let's see how it works out!)

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/data/check

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec dbus-send --system / org.freedesktop.DBus.Peer.Ping > /dev/null 2> /dev/null

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd

@@ -0,0 +1 @@
+3

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run

@@ -1,4 +1,3 @@
 #!/command/with-contenv sh
-rm -rf /var/run/dbus/dbus.pid
 echo "Starting dbus"
-exec dbus-daemon --system --nofork
+exec s6-notifyoncheck  dbus-daemon --system --nofork --nopidfile

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/data/check

@@ -0,0 +1,10 @@
+#!/bin/sh
+state="$(dbus-send --system --dest=org.freedesktop.Avahi --print-reply / org.freedesktop.Avahi.Server.GetState | grep int32 | awk '{printf $2}')"
+
+# Avahi will return 'state=2' when 'Server startup complete'
+if [ "$state" = 2 ]; then
+    exit 0
+else
+    exit 1
+fi
+

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd

@@ -0,0 +1 @@
+3

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/run

@@ -1,7 +1,3 @@
 #!/command/with-contenv sh
-while [ ! -f /var/run/dbus/dbus.pid ]; do
-  echo "s6-rc: warning: dbus is not running, sleeping for 1 second before trying to start avahi"
-  sleep 1
-done
 echo "Starting avahi"
-exec avahi-daemon --no-chroot
+exec s6-notifyoncheck avahi-daemon --no-chroot

docker/etc/s6-overlay/s6-rc.d/02-dbus/data/check

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec dbus-send --system / org.freedesktop.DBus.Peer.Ping > /dev/null 2> /dev/null

docker/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd

@@ -0,0 +1 @@
+3

docker/etc/s6-overlay/s6-rc.d/02-dbus/run

@@ -1,4 +1,3 @@
 #!/command/with-contenv sh
-rm -rf /var/run/dbus/dbus.pid
 echo "Starting dbus"
-exec dbus-daemon --system --nofork
+exec s6-notifyoncheck  dbus-daemon --system --nofork --nopidfile

docker/etc/s6-overlay/s6-rc.d/03-avahi/data/check

@@ -0,0 +1,10 @@
+#!/bin/sh
+state="$(dbus-send --system --dest=org.freedesktop.Avahi --print-reply / org.freedesktop.Avahi.Server.GetState | grep int32 | awk '{printf $2}')"
+
+# Avahi will return 'state=2' when 'Server startup complete'
+if [ "$state" = 2 ]; then
+    exit 0
+else
+    exit 1
+fi
+

docker/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd

@@ -0,0 +1 @@
+3

docker/etc/s6-overlay/s6-rc.d/03-avahi/run

@@ -1,7 +1,3 @@
 #!/command/with-contenv sh
-while [ ! -f /var/run/dbus/dbus.pid ]; do
-  echo "s6-rc: warning: dbus is not running, sleeping for 1 second before trying to start avahi"
-  sleep 1
-done
 echo "Starting avahi"
-exec avahi-daemon --no-chroot
+exec s6-notifyoncheck avahi-daemon --no-chroot