diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index d06004d8..9c6612e3 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -63,7 +63,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2.6.1 + uses: docker/build-push-action@v2.7.0 with: context: . platforms: linux/amd64,linux/arm/v7,linux/arm64 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 232500a9..baf8ef13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v2.6.1 + uses: docker/build-push-action@v2.7.0 with: context: . file: ./Dockerfile diff --git a/Dockerfile b/Dockerfile index 7a598a0b..eab73360 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,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=1.6.0 --var app=mc-server-runner --file {{.app}} \ + --var version=1.7.0 --var app=mc-server-runner --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/README.md b/README.md index ae812249..45d1b375 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Examples](#examples) * [Amazon Web Services (AWS) Deployment](#amazon-web-services-aws-deployment) * [Using Docker Compose](#using-docker-compose) + * [Troubleshooting](#troubleshooting) * [Server types](#server-types) * [Running a Forge Server](#running-a-forge-server) * [Running a Bukkit/Spigot server](#running-a-bukkitspigot-server) @@ -52,6 +53,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Running an Canyon server](#running-an-canyon-server) * [Running a SpongeVanilla server](#running-a-spongevanilla-server) * [Running a Fabric Server](#running-a-fabric-server) + * [Running a Limbo server](#running-a-limbo-server) * [Running a server with a Feed the Beast modpack](#running-a-server-with-a-feed-the-beast-modpack) * [Environment Variables:](#environment-variables) * [Upgrading](#upgrading) @@ -127,7 +129,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + @@ -349,6 +351,14 @@ and in the same directory as that file run Now, go play...or adjust the `environment` section to configure this server instance. +## Troubleshooting + +To troubleshoot the container initialization, such as when server files are pre-downloaded, set the environment variable `DEBUG` to `true`. The container logs will include **much more** output, and it is highly recommended including that output when reporting any [issues](https://github.com/itzg/docker-minecraft-server/issues). + +To troubleshoot just the command-line used to start the Minecraft server, set the environment variable `DEBUG_EXEC` to `true`. + +To troubleshoot any issues with memory allocation reported by the JVM, set the environment variable `DEBUG_MEMORY` to `true`. + ## Server types ### Running a Forge Server @@ -553,6 +563,20 @@ docker run -d -v /path/on/host:/data ... \ In order to add mods, you have two options: +### Running a Limbo server + +A [Limbo](https://github.com/LOOHP/Limbo) server can be run by setting `TYPE` to `LIMBO`. + +Configuration options with defaults: + +- `LIMBO_BUILD`=LATEST + + The `VERSION` will be ignored so locate the appropriate value from [here](https://ci.loohpjames.com/job/Limbo/) to match the version expected by clients. + +- `FORCE_REDOWNLOAD`=false +- `LIMBO_SCHEMA_FILENAME`=default.schem +- `LEVEL`="Default;${LIMBO_SCHEMA_FILENAME}" + ## Running a server with a Feed the Beast modpack > **NOTE** requires one of the Debian based images listed in [the Java versions section](#running-minecraft-server-on-different-java-version). @@ -985,6 +1009,10 @@ For example (just the `-e` bits): -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS=3;minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;2;' +In Minecraft 1.13+ you need to pass json ([generator site](https://misode.github.io/world/)) like this (details see [here](https://github.com/itzg/docker-minecraft-server/issues/999#issuecomment-907849644)): + + -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS={"biome":"minecraft:the_void","layers":[{"block":"minecraft:bedrock","height":1},{"block":"minecraft:stone","height":10},{"block":"minecraft:dirt","height":1}],"structures":{"structures":{}}}' + ### Custom Server Resource Pack You can set a link to a custom resource pack and set it's checksum using the `RESOURCE_PACK` and `RESOURCE_PACK_SHA1` options respectively, the default is blank: diff --git a/start-configuration b/start-configuration index 723d3ed3..5ff8468e 100644 --- a/start-configuration +++ b/start-configuration @@ -169,11 +169,15 @@ case "${TYPE^^}" in exec ${SCRIPTS:-/}start-deployCanyon "$@" ;; + LIMBO) + exec ${SCRIPTS:-/}start-deployLimbo "$@" + ;; + *) log "Invalid type: '$TYPE'" log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only)," log " CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR" - log " CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA, AIRPLANE, CANYON" + log " CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA, AIRPLANE, CANYON, LIMBO" exit 1 ;; diff --git a/start-deployLimbo b/start-deployLimbo new file mode 100644 index 00000000..5abb5bce --- /dev/null +++ b/start-deployLimbo @@ -0,0 +1,64 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +. ${SCRIPTS:-/}start-utils +isDebugging && set -x + +: ${LIMBO_BUILD:=LATEST} +: ${FORCE_REDOWNLOAD:=false} +: ${LIMBO_SCHEMA_FILENAME:=default.schem} +: ${LEVEL:=Default;${LIMBO_SCHEMA_FILENAME}} +# defaults to localhost, if this is not set +: ${SERVER_IP:=0.0.0.0} + +export LEVEL SERVER_IP + +if [[ ${LIMBO_BUILD^^} == LATEST ]]; then + LIMBO_BUILD=lastStableBuild +fi + +baseUrl="https://ci.loohpjames.com/job/Limbo/${LIMBO_BUILD}" +buildInfoUrl="${baseUrl}/api/json" +buildJson=$(curl -fsSL "${buildInfoUrl}") +if [ $? != 0 ]; then + log "ERROR failed to get build info from ${buildInfoUrl} (status=$?)" + exit 1 +fi + +if [[ ${LIMBO_BUILD} = lastStableBuild ]]; then + LIMBO_BUILD=$(jq -r '.number' <<<${buildJson}) + log "Resolved latest Limbo build to ${LIMBO_BUILD}" +fi +artifactPath=$(jq -r '.artifacts[] | select(.fileName|test("^Limbo-")) | .relativePath' <<<${buildJson}) +defaultSchemaPath=$(jq -r '.artifacts[] | select(.fileName|test(".*\\.schem")) | .relativePath' <<<${buildJson}) + +export SERVER="limbo-${LIMBO_BUILD}.jar" + +if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then + downloadUrl="${baseUrl}/artifact/${artifactPath}" + log "Downloading Limbo from $downloadUrl ..." + if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then + log "ERROR: failed to download from $downloadUrl (status=$?)" + exit 3 + fi + +fi + +if [ ! -f "${LIMBO_SCHEMA_FILENAME}" ]; then + log "Downloading default schem file" + if ! curl -o "${LIMBO_SCHEMA_FILENAME}" -fsSL "${baseUrl}/artifact/${defaultSchemaPath}"; then + log "ERROR: failed to download schema file $baseUrl (status=$?)" + exit 3 + fi +fi + +if [[ ${LEVEL} != *\;* ]]; then + LEVEL="${LEVEL};${LIMBO_SCHEMA_FILENAME}" +fi +export LEVEL + +export SKIP_LOG4J_CONFIG=true + +# Continue to Final Setup +exec ${SCRIPTS:-/}start-finalSetupWorld $@ diff --git a/start-finalSetupModpack b/start-finalSetupModpack index 4e956070..855233e2 100644 --- a/start-finalSetupModpack +++ b/start-finalSetupModpack @@ -154,7 +154,10 @@ fi if [[ "${GENERIC_PACK}" ]]; then if isURL "${GENERIC_PACK}"; then log "Downloading generic pack ..." - curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}" + if ! curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"; then + log "ERROR: failed to download ${GENERIC_PACK}" + exit 2 + fi GENERIC_PACK=/tmp/generic_pack.zip fi