Skip to content

Commit 679a6c0

Browse files
committed
Expose config file locations as env vars
(Based on PR factoriotools#367, fixes factoriotools#356)
1 parent 9bdbd90 commit 679a6c0

File tree

1 file changed

+23
-5
lines changed

1 file changed

+23
-5
lines changed

docker/files/docker-entrypoint.sh

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,24 @@ mkdir -p "$MODS"
1313
mkdir -p "$SCENARIOS"
1414
mkdir -p "$SCRIPTOUTPUT"
1515

16+
# Initialize Factorio server configuration files location variables..."
17+
SERVER_SETTINGS_FILE="${SERVER_SETTINGS_FILE:$CONFIG/server-settings.json}"
18+
SERVER_ID_FILE="${SERVER_ID_FILE:$CONFIG/server-id.json}"
19+
ADMINLIST_FILE="${ADMINLIST_FILE:-$CONFIG/server-adminlist.json}"
20+
WHITELIST_FILE="${WHITELIST_FILE:-$CONFIG/server-whitelist.json}"
21+
BANLIST_FILE="${BANLIST_FILE:-$CONFIG/server-banlist.json}"
22+
echo "SERVER_SETTINGS_FILE=$SERVER_SETTINGS_FILE"
23+
echo "SERVER_ID_FILE=$SERVER_ID_FILE"
24+
echo "ADMINLIST_FILE=$ADMINLIST_FILE"
25+
echo "WHITELIST_FILE=$WHITELIST_FILE"
26+
echo "BANLIST_FILE=$BANLIST_FILE"
27+
mkdir -p "$SERVER_SETTINGS_FILE"
28+
mkdir -p "$SERVER_ID_FILE"
29+
mkdir -p "$ADMINLIST_FILE"
30+
mkdir -p "$WHITELIST_FILE"
31+
mkdir -p "$BANLIST_FILE"
32+
33+
1634
if [[ ! -f $CONFIG/rconpw ]]; then
1735
# Generate a new RCON password if none exists
1836
pwgen 15 1 >"$CONFIG/rconpw"
@@ -78,14 +96,14 @@ fi
7896

7997
FLAGS=(\
8098
--port "$PORT" \
81-
--server-settings "$CONFIG/server-settings.json" \
82-
--server-banlist "$CONFIG/server-banlist.json" \
99+
--server-settings "$SERVER_SETTINGS_FILE" \
100+
--server-banlist "$SERVER_ID_FILE" \
83101
--rcon-port "$RCON_PORT" \
84-
--server-whitelist "$CONFIG/server-whitelist.json" \
102+
--server-whitelist "$ADMINLIST_FILE" \
85103
--use-server-whitelist \
86-
--server-adminlist "$CONFIG/server-adminlist.json" \
104+
--server-adminlist "$WHITELIST_FILE" \
87105
--rcon-password "$(cat "$CONFIG/rconpw")" \
88-
--server-id /factorio/config/server-id.json \
106+
--server-id "$BANLIST_FILE" \
89107
)
90108

91109
if [[ $LOAD_LATEST_SAVE == true ]]; then

0 commit comments

Comments
 (0)