mirror of
https://github.com/factoriotools/factorio-docker.git
synced 2025-02-12 08:08:43 +01:00
Merge 6c70b437193b72dee25bf6a56b80a1c4552fc9b2 into effd07f84cce5cfddfaa0f4143db47f7932320c9
This commit is contained in:
commit
19ad38baeb
9
docker/Dockerfile
Normal file → Executable file
9
docker/Dockerfile
Normal file → Executable file
@ -7,6 +7,14 @@ ARG GROUP=factorio
|
|||||||
ARG PUID=845
|
ARG PUID=845
|
||||||
ARG PGID=845
|
ARG PGID=845
|
||||||
|
|
||||||
|
# optionally utilize a built-in map-gen-preset (see data/base/prototypes/map-gen-presets
|
||||||
|
# if this is used, the preset will be used over any .json files supplied
|
||||||
|
# vanilla factorio provides the following presets:
|
||||||
|
# rich-resources, marathon, death-world, death-world-marathon, rail-world, ribbon-world, island
|
||||||
|
# a modded factorio example for using this:
|
||||||
|
# space-exploration
|
||||||
|
ARG PRESET
|
||||||
|
|
||||||
# version checksum of the archive to download
|
# version checksum of the archive to download
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG SHA256
|
ARG SHA256
|
||||||
@ -19,6 +27,7 @@ ENV PORT=34197 \
|
|||||||
VERSION=${VERSION} \
|
VERSION=${VERSION} \
|
||||||
SHA256=${SHA256} \
|
SHA256=${SHA256} \
|
||||||
SAVES=/factorio/saves \
|
SAVES=/factorio/saves \
|
||||||
|
PRESET="$PRESET" \
|
||||||
CONFIG=/factorio/config \
|
CONFIG=/factorio/config \
|
||||||
MODS=/factorio/mods \
|
MODS=/factorio/mods \
|
||||||
SCENARIOS=/factorio/scenarios \
|
SCENARIOS=/factorio/scenarios \
|
||||||
|
@ -20,4 +20,5 @@ services:
|
|||||||
# - USERNAME=FactorioUsername
|
# - USERNAME=FactorioUsername
|
||||||
# - TOKEN=FactorioToken
|
# - TOKEN=FactorioToken
|
||||||
# - PORT=34198
|
# - PORT=34198
|
||||||
|
# - PRESET=deathworld
|
||||||
# - ADDR=::1
|
# - ADDR=::1
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eoux pipefail
|
set -eoux pipefail
|
||||||
|
|
||||||
FACTORIO_VOL=/factorio
|
FACTORIO_VOL=/factorio
|
||||||
LOAD_LATEST_SAVE="${LOAD_LATEST_SAVE:-true}"
|
LOAD_LATEST_SAVE="${LOAD_LATEST_SAVE:-true}"
|
||||||
GENERATE_NEW_SAVE="${GENERATE_NEW_SAVE:-false}"
|
GENERATE_NEW_SAVE="${GENERATE_NEW_SAVE:-false}"
|
||||||
|
PRESET="${PRESET:-""}"
|
||||||
SAVE_NAME="${SAVE_NAME:-""}"
|
SAVE_NAME="${SAVE_NAME:-""}"
|
||||||
BIND="${BIND:-""}"
|
BIND="${BIND:-""}"
|
||||||
CONSOLE_LOG_LOCATION="${CONSOLE_LOG_LOCATION:-""}"
|
CONSOLE_LOG_LOCATION="${CONSOLE_LOG_LOCATION:-""}"
|
||||||
@ -70,6 +70,13 @@ if [[ $GENERATE_NEW_SAVE == true ]]; then
|
|||||||
fi
|
fi
|
||||||
if [[ -f "$SAVES/$SAVE_NAME.zip" ]]; then
|
if [[ -f "$SAVES/$SAVE_NAME.zip" ]]; then
|
||||||
echo "Map $SAVES/$SAVE_NAME.zip already exists, skipping map generation"
|
echo "Map $SAVES/$SAVE_NAME.zip already exists, skipping map generation"
|
||||||
|
else
|
||||||
|
if [[ ! -z "$PRESET" ]]; then
|
||||||
|
$SU_EXEC /opt/factorio/bin/x64/factorio \
|
||||||
|
--create "$SAVES/$SAVE_NAME.zip" \
|
||||||
|
--preset "$PRESET" \
|
||||||
|
--map-gen-settings "$CONFIG/map-gen-settings.json" \
|
||||||
|
--map-settings "$CONFIG/map-settings.json"
|
||||||
else
|
else
|
||||||
$SU_EXEC /opt/factorio/bin/x64/factorio \
|
$SU_EXEC /opt/factorio/bin/x64/factorio \
|
||||||
--create "$SAVES/$SAVE_NAME.zip" \
|
--create "$SAVES/$SAVE_NAME.zip" \
|
||||||
@ -77,6 +84,7 @@ if [[ $GENERATE_NEW_SAVE == true ]]; then
|
|||||||
--map-settings "$CONFIG/map-settings.json"
|
--map-settings "$CONFIG/map-settings.json"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
FLAGS=(\
|
FLAGS=(\
|
||||||
--port "$PORT" \
|
--port "$PORT" \
|
||||||
|
@ -6,6 +6,8 @@ if [[ -z ${1:-} ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
SERVER_SCENARIO="$1"
|
SERVER_SCENARIO="$1"
|
||||||
|
PRESET="${PRESET:-""}"
|
||||||
|
|
||||||
mkdir -p "$SAVES"
|
mkdir -p "$SAVES"
|
||||||
mkdir -p "$CONFIG"
|
mkdir -p "$CONFIG"
|
||||||
mkdir -p "$MODS"
|
mkdir -p "$MODS"
|
||||||
@ -32,6 +34,7 @@ fi
|
|||||||
exec /opt/factorio/bin/x64/factorio \
|
exec /opt/factorio/bin/x64/factorio \
|
||||||
--port "$PORT" \
|
--port "$PORT" \
|
||||||
--start-server-load-scenario "$SERVER_SCENARIO" \
|
--start-server-load-scenario "$SERVER_SCENARIO" \
|
||||||
|
--preset "$PRESET" \
|
||||||
--map-gen-settings "$CONFIG/map-gen-settings.json" \
|
--map-gen-settings "$CONFIG/map-gen-settings.json" \
|
||||||
--map-settings "$CONFIG/map-settings.json" \
|
--map-settings "$CONFIG/map-settings.json" \
|
||||||
--server-settings "$CONFIG/server-settings.json" \
|
--server-settings "$CONFIG/server-settings.json" \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user