mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly synced 2024-11-23 08:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow the healthcheck run in non-privileged containers as well (#3731)

Browse Source 
fix: allow the healthcheck running in non-privileged containers as well

Fixes #3644 (again).

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2024-09-20 08:41:06 +03:00 committed by GitHub
parent ed21867fe9
commit c9a2334f6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/docker/healthcheck.sh
View File

@ -3,10 +3,21 @@
HOST="localhost"
PORT=$HEALTHCHECK_PORT
if [ -z "$HEALTHCHECK_PORT" ]; then
# check all the TCP listening sockets, filter the dragonfly process, and fetch the port.
# For cases when dragonfly opens multiple ports, we filter with tail to choose one of them.
PORT=$(su dfly -c "netstat -tlnp" | grep "1/dragonfly" | grep -oE ':[0-9]+' | cut -c2- | tail -n 1)
# try unpriveleged version first. This should cover cases when the container is running
# without root, for example:
# docker run --group-add 999 --cap-drop=ALL --user 999 docker.dragonflydb.io/dragonflydb/dragonfly
DF_NET=$(netstat -tlnp | grep "1/dragonfly")
if [ -z "$DF_NET" ]; then
# if we failed, then lets try the priveleged version. is triggerred by the regular command:
# docker run docker.dragonflydb.io/dragonflydb/dragonfly
DF_NET=$(su dfly -c "netstat -tlnp" | grep "1/dragonfly")
fi
# check all the TCP ports, and fetch the port.
# For cases when dragonfly opens multiple ports, we filter with tail to choose one of them.
PORT=$(echo $DF_NET | grep -oE ':[0-9]+' | cut -c2- | tail -n 1)
fi
# If we're running with TLS enabled, utilise OpenSSL for the check