diff --git a/Dockerfile b/Dockerfile index e486a78..1161613 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,9 @@ FROM debian # hook into docker BuildKit --platform support # see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope +ARG TARGETOS ARG TARGETARCH +ARG TARGETVARIANT RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ @@ -32,17 +34,28 @@ WORKDIR /data ENTRYPOINT ["/usr/local/bin/entrypoint-demoter", "--match", "/data", "--debug", "--stdin-on-term", "stop", "/opt/bedrock-entry.sh"] +ARG APPS_REV=1 +ARG GITHUB_BASEURL=https://github.com + ARG EASY_ADD_VERSION=0.8.2 -ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-add_linux_${TARGETARCH} /usr/local/bin/easy-add -RUN chmod +x /usr/local/bin/easy-add +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 -RUN easy-add --var version=0.4.1 --var app=entrypoint-demoter --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/v{{.version}}/{{.app}}_{{.version}}_linux_${TARGETARCH}.tar.gz +ARG ENTRYPOINT_DEMOTER_VERSION=0.4.2 +RUN easy-add --var version=${ENTRYPOINT_DEMOTER_VERSION} --var app=entrypoint-demoter --file {{.app}} --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/v{{.version}}/{{.app}}_{{.version}}_linux_${TARGETARCH}.tar.gz -RUN easy-add --var version=0.1.1 --var app=set-property --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${TARGETARCH}.tar.gz +ARG SET_PROPERTY_VERSION=0.1.1 +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=1.7.0 --var app=restify --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${TARGETARCH}.tar.gz +ARG RESTIFY_VERSION=1.7.1 +RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ + --var version=${RESTIFY_VERSION} --var app=restify --file {{.app}} \ + --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -RUN easy-add --var version=0.12.6 --var app=mc-monitor --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${TARGETARCH}.tar.gz +ARG MC_MONITOR_VERSION=0.12.6 +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 COPY *.sh /opt/ diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index 1841a7d..c9eee67 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -8,7 +8,7 @@ services: GAMEMODE: survival DIFFICULTY: normal ports: - - 19132:19132/udp + - "19132:19132/udp" volumes: - bds:/data stdin_open: true