diff --git a/.dockerignore b/.dockerignore index d3a1239..2977676 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,5 @@ -docs/* \ No newline at end of file +docs/* +.git +examples/ +*.md +.github \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index f22043d..8282281 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,8 +29,7 @@ ARG GITHUB_BASEURL=https://github.com # renovate: datasource=github-releases packageName=itzg/easy-add 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 -RUN chmod +x /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 # renovate: datasource=github-releases packageName=itzg/entrypoint-demoter 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 # 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} \ --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 @@ -75,7 +74,7 @@ ENV VERSION=LATEST \ SERVER_PORT_V6=19133 \ 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 VERSION=local diff --git a/README.md b/README.md index fb5bfba..7559380 100644 --- a/README.md +++ b/README.md @@ -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. -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. ## IPv6 same-port fix diff --git a/bin/bds-healthcheck b/bin/bds-healthcheck deleted file mode 100755 index cbab435..0000000 --- a/bin/bds-healthcheck +++ /dev/null @@ -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"