diff --git a/Dockerfile b/Dockerfile index 6c0b6fd..485efca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ - --var version=0.10.1 --var app=mc-monitor --file {{.app}} \ + --var version=0.10.3 --var app=mc-monitor --file {{.app}} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ diff --git a/bin/mc-health b/bin/mc-health index 9c39ba4..d5f2f65 100755 --- a/bin/mc-health +++ b/bin/mc-health @@ -2,6 +2,9 @@ # shellcheck source=../scripts/start-utils . "${SCRIPTS:-/}start-utils" +if [ -f /data/.mc-health.env ]; then + . /data/.mc-health.env +fi if isTrue "${DISABLE_HEALTHCHECK}"; then echo "Healthcheck disabled" @@ -10,6 +13,6 @@ elif isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -ax -o stat,comm | grep 'java' | echo "Java process suspended by Autopause function" exit 0 else - mc-monitor status --host localhost --port "${SERVER_PORT:-25565}" + mc-monitor status "${MC_HEALTH_EXTRA_ARGS[@]}" --host localhost --port "${SERVER_PORT:-25565}" exit $? fi diff --git a/scripts/start-configuration b/scripts/start-configuration index bea25b4..4afe71e 100755 --- a/scripts/start-configuration +++ b/scripts/start-configuration @@ -92,6 +92,14 @@ if isTrue "${ENABLE_AUTOPAUSE}"; then ${SCRIPTS:-/}start-autopause fi +if versionLessThan 1.7; then + echo " +MC_HEALTH_EXTRA_ARGS=( + --use-server-list-ping +) + " > /data/.mc-health.env +fi + log "Resolving type given ${TYPE}" case "${TYPE^^}" in *BUKKIT|SPIGOT) diff --git a/scripts/start-deployFTBA b/scripts/start-deployFTBA index 5c6f5c4..0e1d346 100755 --- a/scripts/start-deployFTBA +++ b/scripts/start-deployFTBA @@ -67,7 +67,7 @@ variants=( forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar fabric-${mcVersion}-${fabricVersion}-server-launch.jar ) -for f in ${variants[@]}; do +for f in "${variants[@]}"; do if [ -f $f ]; then export SERVER=$f break