Better s6 service stop handling

cts/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 cts }
+foreground { s6-svwait -d -t 3000 nginx }

cts/lxc/etc/services.d/cts/down-signal

@@ -0,0 +1 @@
+SIGINT

frontlinesms/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 frontlinesms }
+foreground { s6-svwait -d -t 3000 x11 }

kanboard/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 nginx }
+foreground { s6-svwait -d -t 3000 php-fpm }

mifosx/lxc/etc/services.d/.s6-svscan/finish

@@ -0,0 +1,3 @@
+#!/bin/execlineb -P
+
+foreground { s6-svwait -d -t 3000 mifosx }

mifosx/lxc/etc/services.d/mifosx/run

@@ -0,0 +1,6 @@
+#!/bin/execlineb -P
+
+cd /srv/tomcat
+fdmove -c 2 1
+s6-setuidgid mifosx
+catalina.sh run

mifosx/lxcfile

@@ -39,9 +39,10 @@ RUN EOF
     rm /tmp/locale-cs.patch
 EOF
 
+# s6 required for single service due to hanging threads
+COPY lxc
+
 MOUNT FILE /srv/mifosx/conf/server.xml srv/tomcat/conf/server.xml
 MOUNT FILE /srv/mifosx/conf/context.xml srv/tomcat/webapps/fineract-provider/META-INF/context.xml
 
-USER 8012 8012
+CMD s6-svscan /etc/services.d
-WORKDIR /srv/tomcat
-CMD catalina.sh run

opendatakit-build/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 build2xlsform } 
+foreground { s6-svwait -d -t 3000 odkbuild }

opendatakit-build/lxc/etc/services.d/odkbuild/down-signal

@@ -0,0 +1 @@
+SIGINT

opendatakit-build/lxc/etc/services.d/odkbuild/run

@@ -2,6 +2,6 @@
 
 cd /srv/opendatakit-build
 fdmove -c 2 1
-foreground { /usr/sbin/update-ca-certificates }
+foreground { update-ca-certificates }
 s6-setuidgid odkbuild
 bundle exec rackup config.ru -o 0.0.0.0 -p 8080

openmapkit/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 openmapkit }

openmapkit/lxcfile

@@ -36,6 +36,7 @@ RUN EOF
     rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm
 EOF
 
+# s6 required for single service due to inability of nodejs to process signals when running as PID 1
 COPY lxc
 
 MOUNT FILE /srv/openmapkit/conf/settings.js srv/openmapkit/settings.js

pandora/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,7 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 nginx }
+foreground { s6-svwait -d -t 3000 pandora }
+foreground { s6-svwait -d -t 3000 pandora-cron }
+foreground { s6-svwait -d -t 3000 pandora-encoding }
+foreground { s6-svwait -d -t 3000 pandora-tasks }

sahana/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 nginx }
+foreground { s6-svwait -d -t 3000 uwsgi }

sahana/lxc/etc/services.d/uwsgi/down-signal

@@ -0,0 +1 @@
+SIGINT

seeddms/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 nginx }
+foreground { s6-svwait -d -t 3000 php-fpm }

ushahidi/lxc/etc/services.d/.s6-svscan/finish

@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/execlineb -P
 
-/bin/true
+foreground { s6-svwait -d -t 3000 nginx }
+foreground { s6-svwait -d -t 3000 php-fpm }