File tree Expand file tree Collapse file tree 3 files changed +17
-1
lines changed
Expand file tree Collapse file tree 3 files changed +17
-1
lines changed Original file line number Diff line number Diff line change 5757 ${{ steps.meta.outputs.labels }}
5858 manymine.enable=true
5959 pull : true
60+ build-args : |
61+ BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
62+ VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
63+ REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
6064 cache-from : type=gha
6165 cache-to : type=gha,mode=max
Original file line number Diff line number Diff line change @@ -56,3 +56,12 @@ ENV VERSION=LATEST \
5656 SERVER_PORT=19132
5757
5858HEALTHCHECK --start-period=1m CMD /usr/local/bin/mc-monitor status-bedrock --host 127.0.0.1 --port $SERVER_PORT
59+
60+ ARG BUILDTIME=local
61+ ARG VERSION=local
62+ ARG REVISION=local
63+ COPY <<EOF /etc/image.properties
64+ buildtime=${BUILDTIME}
65+ version=${VERSION}
66+ revision=${REVISION}
67+ EOF
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ set -eo pipefail
66: " ${PREVIEW:= false} "
77# Both net and net-secondary hostnames work
88: " ${DOWNLOAD_LINKS_URL:= https:// net-secondary.web.minecraft-services.net/ api/ v1.0/ download/ links} "
9+ : " ${USE_BOX64:= true} "
910
1011function isTrue() {
1112 [[ " ${1,,} " =~ ^(true| on| 1)$ ]] && return 0
@@ -96,6 +97,8 @@ function lookupVersion() {
9697 fi
9798}
9899
100+ echo " Image info: $( paste -d, -s /etc/image.properties) "
101+
99102if [[ ${DEBUG^^} == TRUE ]]; then
100103 set -x
101104 curlArgs=(-v)
@@ -309,7 +312,7 @@ if isTrue "${ENABLE_SSH}"; then
309312fi
310313
311314echo " Starting Bedrock server..."
312- if [[ -f /usr/local/bin/box64 ]] ; then
315+ if [[ -f /usr/local/bin/box64 ]] && isTrue " ${USE_BOX64} " ; then
313316 exec mc-server-runner " ${mcServerRunnerArgs[@]} " box64 ./" $SERVER "
314317else
315318 exec mc-server-runner " ${mcServerRunnerArgs[@]} " ./" $SERVER "
You can’t perform that action at this time.
0 commit comments