diff --git a/minecraft-server/examples/docker-compose-ftb.yml b/minecraft-server/examples/docker-compose-ftb.yml new file mode 100644 index 00000000..f6c49488 --- /dev/null +++ b/minecraft-server/examples/docker-compose-ftb.yml @@ -0,0 +1,16 @@ +version: '3.2' + +services: + mc: + image: itzg/minecraft-server + environment: + EULA: "true" + TYPE: FTB + FTB_SERVER_MOD: https://www.feed-the-beast.com/projects/ftb-presents-skyfactory-3/files/2481284 + ports: + - 25565:25565 + volumes: + - mc-ftb:/data + +volumes: + mc-ftb: \ No newline at end of file diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup index 567cc93d..c6c1f306 100755 --- a/minecraft-server/start-minecraftFinalSetup +++ b/minecraft-server/start-minecraftFinalSetup @@ -73,8 +73,7 @@ if [[ ${GUI} = false || ${GUI} = FALSE ]]; then fi # put these prior JVM_OPTS at the end to give any memory settings there higher precedence -echo "Setting initial memory to ${INIT_MEMORY:-${MEMORY}} and max to ${MAX_MEMORY:-${MEMORY}}" -JVM_OPTS="-Xms${INIT_MEMORY:-${MEMORY}} -Xmx${MAX_MEMORY:-${MEMORY}} ${JVM_OPTS}" +echo "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}" if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then if [ ! -e ${FTB_DIR}/ops.json -a -e /data/ops.txt ]; then @@ -89,14 +88,20 @@ if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then cp -f /data/eula.txt ${FTB_DIR}/ fi + cat > ${FTB_DIR}/settings-local.sh <