Revert "Use tini as PID 1 inside the container"

This reverts commit 31d6d84433.

While tini successfully forwards signals, this leads to `runuser`
killing prosody now. The container does terminate in 10 seconds, so
Docker is happy and you could argue that actually fixes #68, but it's no
graceful shutdown. The revert is done because it's easier to apply a
real fix without tini.
This commit is contained in:
Alexander Dahl 2021-03-21 20:16:33 +01:00 committed by Kim Alvefur
parent 52cd642d38
commit 83556a4c5a
2 changed files with 2 additions and 3 deletions

View file

@ -30,7 +30,6 @@ RUN apt-get update \
openssl \
ca-certificates \
ssl-cert \
tini \
&& rm -rf /var/lib/apt/lists/*
# Install and configure prosody

View file

@ -10,7 +10,7 @@ if [[ "$(stat -c %u /var/run/prosody/)" != "$data_dir_owner" ]]; then
fi
if [[ "$1" != "prosody" ]]; then
exec tini -- prosodyctl "$@"
exec prosodyctl "$@"
exit 0;
fi
@ -18,4 +18,4 @@ if [[ "$LOCAL" && "$PASSWORD" && "$DOMAIN" ]]; then
prosodyctl register "$LOCAL" "$DOMAIN" "$PASSWORD"
fi
exec tini -- runuser -u prosody -- "$@"
exec runuser -u prosody -- "$@"