Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2024-12-16 23:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto-merging via docker-versions-create

Browse source
This commit is contained in:
Geoff Bourne 2021-07-08 07:39:17 -05:00
commit a1ce1b5a24
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-multiarch.yml vendored
View file

@ -63,7 +63,7 @@ jobs:
- name: Build and push - name: Build and push
id: docker_build id: docker_build
uses: docker/build-push-action@v2.5.0 uses: docker/build-push-action@v2.6.1
with: with:
context: . context: .
platforms: linux/amd64,linux/arm/v7,linux/arm64 platforms: linux/amd64,linux/arm/v7,linux/arm64

2
.github/workflows/main.yml vendored
View file

@ -70,7 +70,7 @@ jobs:
- name: Build and push - name: Build and push
id: docker_build id: docker_build
uses: docker/build-push-action@v2.5.0 uses: docker/build-push-action@v2.6.1
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile

4
README.md
View file

@ -119,7 +119,7 @@ By default, the container will download the latest version of the "vanilla" [Min
* [PVP Mode](#pvp-mode) * [PVP Mode](#pvp-mode)
* [Level Type and Generator Settings](#level-type-and-generator-settings) * [Level Type and Generator Settings](#level-type-and-generator-settings)
* [Custom Server Resource Pack](#custom-server-resource-pack) * [Custom Server Resource Pack](#custom-server-resource-pack)
* [World Save Name](#world-save-name) * [Level / World Save Name](#level--world-save-name)
* [Online mode](#online-mode) * [Online mode](#online-mode)
* [Allow flight](#allow-flight) * [Allow flight](#allow-flight)
* [Other server property mappings](#other-server-property-mappings) * [Other server property mappings](#other-server-property-mappings)
@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min
* [Enabling Autopause](#enabling-autopause) * [Enabling Autopause](#enabling-autopause)
* [Running on RaspberryPi](#running-on-raspberrypi) * [Running on RaspberryPi](#running-on-raspberrypi)
<!-- Added by: runner, at: Mon Jun 28 12:13:57 UTC 2021 --> <!-- Added by: runner, at: Sun Jul 4 19:53:56 UTC 2021 -->
<!--te--> <!--te-->

10
start-deployTuinity
View file

@ -3,16 +3,16 @@
. ${SCRIPTS:-/}start-utils . ${SCRIPTS:-/}start-utils
if [ "${VERSION}" != "LATEST" ]; then if [ "${VERSION}" != "LATEST" ]; then
log "ERROR: Tunity server type only supports VERSION=LATEST" log "ERROR: Tuinity server type only supports VERSION=LATEST"
exit 1 exit 1
fi fi
: ${TUNITY_BUILD:=lastSuccessfulBuild} : ${TUINITY_BUILD:=lastSuccessfulBuild}
export SERVER=tunity-${VANILLA_VERSION}-${TUNITY_BUILD}.jar export SERVER=tuinity-${VANILLA_VERSION}-${TUINITY_BUILD}.jar
if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUNITY_BUILD}/artifact/tuinity-paperclip.jar" downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUINITY_BUILD}/artifact/tuinity-paperclip.jar"
log "Downloading Tunity (build $TUNITY_BUILD) from $downloadUrl ..." log "Downloading Tuinity (build $TUINITY_BUILD) from $downloadUrl ..."
curl -fsSL -o "$SERVER" "$downloadUrl" curl -fsSL -o "$SERVER" "$downloadUrl"
if [ ! -f "$SERVER" ]; then if [ ! -f "$SERVER" ]; then
log "ERROR: failed to download from $downloadUrl (status=$?)" log "ERROR: failed to download from $downloadUrl (status=$?)"

2
start-finalSetupServerProperties
View file

@ -19,7 +19,7 @@ function setServerProp {
sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES" sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
else else
log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}" log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
echo "${prop}=${var//\\/\\\\}" >> "$SERVER_PROPERTIES" echo "${prop}=${var}" >> "$SERVER_PROPERTIES"
fi fi
else else
isDebugging && log "Skip setting ${prop}" isDebugging && log "Skip setting ${prop}"