mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-02-24 01:56:24 +00:00
Setup MEMORY variables earlier to allow use in Spigot build (#1779)
This commit is contained in:
@@ -20,6 +20,11 @@ IFS=$'\n\t'
|
||||
: "${RCON_PORT:=25575}"
|
||||
export RCON_PASSWORD RCON_PORT
|
||||
|
||||
: "${MEMORY=1G}"
|
||||
: "${INIT_MEMORY=${MEMORY}}"
|
||||
: "${MAX_MEMORY=${MEMORY}}"
|
||||
export MEMORY INIT_MEMORY MAX_MEMORY
|
||||
|
||||
shopt -s nullglob
|
||||
|
||||
isDebugging && set -x
|
||||
|
||||
@@ -113,10 +113,6 @@ if [[ ${GUI,,} = false ]]; then
|
||||
EXTRA_ARGS+=" nogui"
|
||||
fi
|
||||
|
||||
: "${MEMORY=1G}"
|
||||
: "${INIT_MEMORY=${MEMORY}}"
|
||||
: "${MAX_MEMORY=${MEMORY}}"
|
||||
|
||||
expandedDOpts=
|
||||
if [ -n "$JVM_DD_OPTS" ]; then
|
||||
for dopt in $JVM_DD_OPTS
|
||||
|
||||
Reference in New Issue
Block a user