Update to mc-monitor 0.18.0 to support NetherNet healthcheck (#679)

This commit is contained in:
Mohamed Karam authored and GitHub committed 2026-09-19 08:21:53 -05:00
1 parent 71fbc302b4
commit 86e3aa9b55
4 files changed
+7 -17

No files matched your search

+4
View File
@@ -1 +1,5 @@
docs/* docs/*
.git
examples/
*.md
.github
+3 -4
View File
@@ -29,8 +29,7 @@ ARG GITHUB_BASEURL=https://github.com
# renovate: datasource=github-releases packageName=itzg/easy-add # renovate: datasource=github-releases packageName=itzg/easy-add
ARG EASY_ADD_VERSION=0.8.17 ARG EASY_ADD_VERSION=0.8.17
ADD ${GITHUB_BASEURL}/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add ADD --chmod=755 ${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
# renovate: datasource=github-releases packageName=itzg/entrypoint-demoter # renovate: datasource=github-releases packageName=itzg/entrypoint-demoter
ARG ENTRYPOINT_DEMOTER_VERSION=0.5.1 ARG ENTRYPOINT_DEMOTER_VERSION=0.5.1
@@ -41,7 +40,7 @@ ARG SET_PROPERTY_VERSION=0.1.6
RUN easy-add --var version=${SET_PROPERTY_VERSION} --var app=set-property --file {{.app}} --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${TARGETARCH}.tar.gz RUN easy-add --var version=${SET_PROPERTY_VERSION} --var app=set-property --file {{.app}} --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${TARGETARCH}.tar.gz
# renovate: datasource=github-releases packageName=itzg/mc-monitor # renovate: datasource=github-releases packageName=itzg/mc-monitor
ARG MC_MONITOR_VERSION=0.17.1 ARG MC_MONITOR_VERSION=0.18.0
RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \ --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 --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
@@ -75,7 +74,7 @@ ENV VERSION=LATEST \
SERVER_PORT_V6=19133 \ SERVER_PORT_V6=19133 \
ENABLE_BDS_V6BIND_FIX=false ENABLE_BDS_V6BIND_FIX=false
HEALTHCHECK --start-period=1m CMD /usr/local/bin/bds-healthcheck HEALTHCHECK --start-period=1m CMD /usr/local/bin/mc-monitor status-bedrock --host 127.0.0.1 --port $SERVER_PORT
ARG BUILDTIME=local ARG BUILDTIME=local
ARG VERSION=local ARG VERSION=local
-2
View File
@@ -170,8 +170,6 @@ docker run -d -it --name bds-flat-creative \
`TRANSPORT`, `SERVER_UDP_PORTS`, and `SERVER_IP` are mapped into `server.properties` the same way as the other keys on this list. `TRANSPORT`, `SERVER_UDP_PORTS`, and `SERVER_IP` are mapped into `server.properties` the same way as the other keys on this list.
When `TRANSPORT=nethernet`, the image healthcheck is `GET http://127.0.0.1:$SERVER_PORT/v1/join`. Otherwise it still runs `mc-monitor status-bedrock` on `$SERVER_PORT`.
[examples/nethernet/compose.yml](examples/nethernet/compose.yml) sets `TRANSPORT=nethernet` and publishes `19132/tcp` plus UDP `19140-19155`. `SERVER_UDP_PORTS` values are those documented in the BDS `server.properties` comments. LAN discovery (UDP 7551) was not tested. [examples/nethernet/compose.yml](examples/nethernet/compose.yml) sets `TRANSPORT=nethernet` and publishes `19132/tcp` plus UDP `19140-19155`. `SERVER_UDP_PORTS` values are those documented in the BDS `server.properties` comments. LAN discovery (UDP 7551) was not tested.
## IPv6 same-port fix ## IPv6 same-port fix
-11
View File
@@ -1,11 +0,0 @@
#!/bin/bash
# Only probe NetherNet HTTP when the user asked for it. Otherwise RakNet UDP
# via mc-monitor — including unset TRANSPORT and older VERSION= pins.
SERVER_PORT="${SERVER_PORT:-19132}"
if [[ "${TRANSPORT,,}" == "nethernet" ]]; then
exec curl -fsS -o /dev/null --max-time 5 "http://127.0.0.1:${SERVER_PORT}/v1/join"
fi
exec mc-monitor status-bedrock --host 127.0.0.1 --port "$SERVER_PORT"