Initial commit
This commit is contained in:
Executable
+10
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
set -x
|
||||
|
||||
RFB_PORT=59${DISPLAY_NUM}
|
||||
NOVNC_PORT=80${DISPLAY_NUM}
|
||||
|
||||
echo Display at ${DISPLAY} with ${SCREEN_W}x${SCREEN_H}x24
|
||||
/opt/TurboVNC/bin/Xvnc ${DISPLAY} -geometry ${SCREEN_W}x${SCREEN_H} -depth 24 +xinerama -securitytypes none >/var/log/xvfb.log &
|
||||
fluxbox &
|
||||
/tmp/websockify/run -D --web=/tmp/noVNC/ --cert=/tmp/novnc.pem --key=/tmp/novnc.key ${NOVNC_PORT} localhost:${RFB_PORT}
|
||||
Executable
+34
@@ -0,0 +1,34 @@
|
||||
#!/usr/bin/env bash
|
||||
APP=$1
|
||||
set -x
|
||||
|
||||
# Signal helper
|
||||
source /opt/scripts/signals.sh
|
||||
|
||||
PID=0
|
||||
TERM_handler() {
|
||||
SIGNAME="$1"
|
||||
echo "Killing ${PID}"
|
||||
echo "Signal ${SIGNAME}"
|
||||
if [ ${PID} -ne 0 ]; then
|
||||
ps -ef --forest
|
||||
CHILDS=$(pgrep -P "${PID}")
|
||||
kill -"${SIGNAME}" -"${PID}"
|
||||
for i in $CHILDS; do
|
||||
wait $i
|
||||
done
|
||||
fi
|
||||
ps -ef --forest
|
||||
ret=$(signal_return_val ${SIGNAME})
|
||||
exit $ret
|
||||
}
|
||||
|
||||
signals_trap_with_arg TERM_handler SIGTERM
|
||||
${APP} &
|
||||
PID=$$
|
||||
|
||||
# wait forever
|
||||
signals_wait_forever
|
||||
|
||||
# https://docs.docker.com/compose/faq/
|
||||
# https://medium.com/@gchudnov/trapping-signals-in-docker-containers-7a57fdda7d86
|
||||
@@ -0,0 +1,25 @@
|
||||
signals_trap_with_arg() {
|
||||
func="$1" ; shift
|
||||
for sig ; do
|
||||
echo "$func $sig"
|
||||
trap "$func $sig" "$sig"
|
||||
done
|
||||
}
|
||||
|
||||
signals_wait_forever() {
|
||||
while true
|
||||
do
|
||||
tail -f /dev/null & wait ${!}
|
||||
done
|
||||
}
|
||||
|
||||
signal_name_to_number() {
|
||||
SIGNAME="$1"
|
||||
trap -l | sed -nr "s/.*\b([0-9]+)\) $SIGNAME.*/\1/p"
|
||||
}
|
||||
|
||||
signal_return_val() {
|
||||
SIGNAME="$1"
|
||||
SIGNUM=$(signal_name_to_number ${SIGNAME})
|
||||
echo "128 + $SIGNUM" | bc
|
||||
}
|
||||
Reference in New Issue
Block a user