Exit container if homebridge process finishes (#9)

homebridge · Jul 8, 2017 · 6c7f5c2 · 6c7f5c2
1 parent 0ed0a1e
commit 6c7f5c2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/ci/test-homebridge.sh b/ci/test-homebridge.sh
@@ -2,7 +2,7 @@
 
 setup() {
   docker run --name homebridge -d -p 51826:51826 homebridge
-  sleep 20
+  sleep 15
 }
 
 teardown() {
@@ -23,15 +23,22 @@ testCmd() {
 
 @test "test homebridge starts after a graceful restart" {
   docker restart homebridge
-  sleep 20
+  sleep 15
   run testCmd
   [ "$status" -eq 0 ]
 }
 
 @test "test homebridge starts after being killed" {
   docker kill homebridge
   docker start homebridge
-  sleep 20
+  sleep 15
   run testCmd
   [ "$status" -eq 0 ]
 }
+
+@test "test container exits when homebridge process stops" {
+  docker exec homebridge pkill homebridge
+  sleep 10
+  run docker exec homebridge echo "This should fail."
+  [ "$status" -ne 0 ]
+}
diff --git a/root/etc/services.d/homebridge/finish b/root/etc/services.d/homebridge/finish
@@ -0,0 +1,3 @@
+#!/usr/bin/execlineb -S0
+
+s6-svscanctl -t /var/run/s6/services
diff --git a/root/etc/services.d/homebridge/run b/root/etc/services.d/homebridge/run
@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv sh
-sleep 5
+sleep 7
 s6-setuidgid abc homebridge -U /homebridge -P /homebridge/node_modules
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/execlineb -S0

		s6-svscanctl -t /var/run/s6/services