healthcheck: use jq to parse json

The use of `grep` requires the HTTP server to return the JSON body in one line. This could change with an update (either intended or not) and would break the healthcheck. Instead, we should parse the JSON and exit with code 1 if the health is not healthy. Signed-off-by: Tan Siewert <[email protected]>
wolveix · Sep 11, 2024 · 428570c · 428570c
1 parent c570e65
commit 428570c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM steamcmd/steamcmd:ubuntu-22
 # hadolint ignore=DL3008
 RUN set -x \
  && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y gosu xdg-user-dirs curl --no-install-recommends\
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y gosu xdg-user-dirs curl jq --no-install-recommends \
  && rm -rf /var/lib/apt/lists/* \
  && useradd -ms /bin/bash steam \
  && gosu nobody true

diff --git a/healthcheck.sh b/healthcheck.sh
@@ -2,5 +2,5 @@
 
 curl -k -f -X POST "https://127.0.0.1:${SERVERGAMEPORT}/api/v1" \
 -H "Content-Type: application/json" \
--d '{"function":"HealthCheck","data":{"clientCustomData":""}}' \
-| grep -q '{"data":{"health":"healthy"'
+-d '{"function":"HealthCheck","data":{"clientCustomData":""}}' | 
+jq -e '.data.health == "healthy"'