Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2024-09-20 14:11:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Setup MEMORY variables earlier to allow use in Spigot build (#1779)

Browse source
This commit is contained in:
Geoff Bourne 2022-10-12 19:23:01 -05:00 committed by GitHub
parent 61592d5c3e
commit 8f5cc315d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/start-configuration
View file

@ -20,6 +20,11 @@ IFS=$'\n\t'
: "${RCON_PORT:=25575}" : "${RCON_PORT:=25575}"
export RCON_PASSWORD RCON_PORT export RCON_PASSWORD RCON_PORT
: "${MEMORY=1G}"
: "${INIT_MEMORY=${MEMORY}}"
: "${MAX_MEMORY=${MEMORY}}"
export MEMORY INIT_MEMORY MAX_MEMORY
shopt -s nullglob shopt -s nullglob
isDebugging && set -x isDebugging && set -x

4
scripts/start-finalExec
View file

@ -113,10 +113,6 @@ if [[ ${GUI,,} = false ]]; then
EXTRA_ARGS+=" nogui" EXTRA_ARGS+=" nogui"
fi fi
: "${MEMORY=1G}"
: "${INIT_MEMORY=${MEMORY}}"
: "${MAX_MEMORY=${MEMORY}}"
expandedDOpts= expandedDOpts=
if [ -n "$JVM_DD_OPTS" ]; then if [ -n "$JVM_DD_OPTS" ]; then
for dopt in $JVM_DD_OPTS for dopt in $JVM_DD_OPTS