Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify signal handling (#771)

Browse source 
Avoid implementing a complex signal relaying mechanism in `docker-entrypoint*.sh`
Instead, the shell performs `exec node ...` and the `node` process receives the signals directly.

Related to #560, #575, which were my initial implemetation.
This commit is contained in:
zstadler 2023-02-19 06:51:48 +02:00 committed by GitHub
parent acde7b0a30
commit f242cc1760
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker-entrypoint.sh
View file

@ -3,7 +3,7 @@ if ! which -- "${1}"; then
# first arg is not an executable # first arg is not an executable
export DISPLAY=:99 export DISPLAY=:99
Xvfb "${DISPLAY}" -nolisten unix & Xvfb "${DISPLAY}" -nolisten unix &
exec node /usr/src/app/ -p 80 "$@" exec node /usr/src/app/ "$@"
fi fi
exec "$@" exec "$@"

2
docker-entrypoint_light.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
if ! which -- "${1}"; then if ! which -- "${1}"; then
# first arg is not an executable # first arg is not an executable
exec node /usr/src/app/ -p 80 "$@" exec node /usr/src/app/ "$@"
fi fi
exec "$@" exec "$@"