Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Better s6 service stop handling

Browse Source
This commit is contained in:
Disassembler 2018-09-21 11:04:12 +02:00
parent 74b7d9478f
commit ed2e1193cb
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
17 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cts/lxc/etc/services.d/.s6-svscan/finish
View File

@ -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 }

1
cts/lxc/etc/services.d/cts/down-signal Normal file
View File

@ -0,0 +1 @@
SIGINT

5
frontlinesms/lxc/etc/services.d/.s6-svscan/finish
View File

@ -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 }

5
kanboard/lxc/etc/services.d/.s6-svscan/finish
View File

@ -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 }

3
mifosx/lxc/etc/services.d/.s6-svscan/finish Executable file
View File

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

6
mifosx/lxc/etc/services.d/mifosx/run Executable file
View File

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

7
mifosx/lxcfile
View File

@ -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
WORKDIR /srv/tomcat
CMD catalina.sh run
CMD s6-svscan /etc/services.d

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

@ -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 }

1
opendatakit-build/lxc/etc/services.d/odkbuild/down-signal Normal file
View File

@ -0,0 +1 @@
SIGINT

2
opendatakit-build/lxc/etc/services.d/odkbuild/run
View File

@ -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

4
openmapkit/lxc/etc/services.d/.s6-svscan/finish
View File

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

1
openmapkit/lxcfile
View File

@ -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

8
pandora/lxc/etc/services.d/.s6-svscan/finish
View File

@ -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 }

5
sahana/lxc/etc/services.d/.s6-svscan/finish
View File

@ -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 }

1
sahana/lxc/etc/services.d/uwsgi/down-signal Normal file
View File

@ -0,0 +1 @@
SIGINT

5
seeddms/lxc/etc/services.d/.s6-svscan/finish
View File

@ -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 }

5
ushahidi/lxc/etc/services.d/.s6-svscan/finish
View File

@ -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 }