velocity: ensure health check uses bind setting from velocity.toml (#230)

Author: itzg

Dockerfile

@@ -19,33 +19,35 @@ ARG TARGETVARIANT
 ARG APPS_REV=1
 ARG GITHUB_BASEURL=https://github.com
 
-ARG EASY_ADD_VERSION=0.8.8
+ARG EASY_ADD_VERSION=0.8.9
 ADD ${GITHUB_BASEURL}/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
 RUN chmod +x /usr/bin/easy-add
 
-ARG MC_MONITOR_VERSION=0.14.1
+ARG MC_MONITOR_VERSION=0.15.3
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG RCON_CLI_VERSION=1.6.9
+ARG RCON_CLI_VERSION=1.6.11
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RCON_CLI_VERSION} --var app=rcon-cli --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 COPY --chmod=444 templates/ /templates/
 
-ARG MC_HELPER_VERSION=1.39.11
+ARG MC_HELPER_VERSION=1.41.1
 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 # used for cache busting local copy of mc-image-helper
 ARG MC_HELPER_REV=1
 RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
   | tar -C /usr/share -zxf - \
   && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
 
-ENV SERVER_PORT=25577 RCON_PORT=25575 MEMORY=512m
-EXPOSE $SERVER_PORT
+ENV RCON_PORT=25575 MEMORY=512m
+# Bungee defaults to 25577
+# Velocity defaults to 25565
+EXPOSE 25577 25565
 
 CMD ["/usr/bin/run-bungeecord.sh"]
 HEALTHCHECK --start-period=10s CMD /usr/bin/health.sh

scripts/health.sh

@@ -1,11 +1,28 @@
 #!/bin/bash
 
-: ${HEALTH_USE_PROXY:=false}
+: "${HEALTH_USE_PROXY:=false}"
 
 args=()
 if [[ "${HEALTH_USE_PROXY^^}" = TRUE ]]; then
-  args+="--use-proxy"
+  args+=("--use-proxy")
 fi
 
-mc-monitor status --host ${HEALTH_HOST:-localhost} --port $SERVER_PORT ${args[@]}
+function resolveServerPort() {
+  if [[ ${TYPE^^} = VELOCITY ]]; then
+    if [[ -f velocity.toml ]]; then
+      bind="$(mc-image-helper toml-path --file=velocity.toml '.bind')"
+      if [[ $bind ]]; then
+        echo "${bind##*:}"
+        return
+      fi
+    fi
+    echo 25565
+  else
+    echo 25577
+  fi
+}
+
+: "${SERVER_PORT:=$(resolveServerPort)}"
+
+mc-monitor status --host "${HEALTH_HOST:-localhost}" --port "$SERVER_PORT" "${args[@]}"
 exit $?