amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-09-28 16:40:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106 from kstrauser/feature/noconsole-envvar

Browse Source 
Added CONSOLE envvar to control console output
This commit is contained in:
Geoff Bourne
2016-09-22 22:07:46 -05:00
committed by GitHub
parent 4c0f24613c c48f85cc4f
commit ddb69ced3b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minecraft-server/Dockerfile
+1 -1
View File
@@ -40,4 +40,4 @@ ENV UID=1000 GID=1000 \
MOTD="A Minecraft Server Powered by Docker" \ MOTD="A Minecraft Server Powered by Docker" \
JVM_OPTS="-Xmx1024M -Xms1024M" \ JVM_OPTS="-Xmx1024M -Xms1024M" \
TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED LEVEL=world PVP=true DIFFICULTY=easy \ TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED LEVEL=world PVP=true DIFFICULTY=easy \
LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= ONLINE_MODE=TRUE LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= ONLINE_MODE=TRUE CONSOLE=true
minecraft-server/start-minecraft.sh
+8 -2
View File
@@ -441,10 +441,16 @@ if [ "$TYPE" = "SPIGOT" ]; then
fi fi
fi fi
if [[ $CONSOLE = false ]]; then
EXTRA_ARGS=--noconsole
else
EXTRA_ARGS=""
fi
# If we have a bootstrap.txt file... feed that in to the server stdin # If we have a bootstrap.txt file... feed that in to the server stdin
if [ -f /data/bootstrap.txt ]; if [ -f /data/bootstrap.txt ];
then then
exec java $JVM_OPTS -jar $SERVER "$@" < /data/bootstrap.txt exec java $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS < /data/bootstrap.txt
else else
exec java $JVM_OPTS -jar $SERVER "$@" exec java $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
fi fi