mirror/factorio-docker
1
0
Fork 0
mirror of https://github.com/factoriotools/factorio-docker.git synced 2024-12-25 02:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Quote all vars, remove useless echo/sub-shell, add shebands, formatting (#226)

Browse Source
This commit is contained in:
Dan Anstis 2019-05-02 14:53:26 +10:00 committed by GitHub
commit e8aeb461a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 172 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
0.14/build.sh
View File

@ -1 +1,2 @@
#!/bin/sh
sudo docker build --no-cache -t factorio . sudo docker build --no-cache -t factorio .

1
0.14/clean.sh
View File

@ -1 +1,2 @@
#!/bin/sh
sudo rm -rf /tmp/factorio sudo rm -rf /tmp/factorio

24
0.14/docker-entrypoint.sh
View File

@ -1,30 +1,30 @@
#!/bin/sh -x #!/bin/sh -x
set -e set -euo pipefail
SAVES=/factorio/saves SAVES=/factorio/saves
CONFIG=/factorio/config CONFIG=/factorio/config
mkdir -p $SAVES mkdir -p "$SAVES"
mkdir -p /factorio/mods mkdir -p /factorio/mods
mkdir -p $CONFIG mkdir -p "$CONFIG"
if [ ! -f $CONFIG/rconpw ]; then if [ ! -f $CONFIG/rconpw ]; then
echo $(pwgen 15 1) > $CONFIG/rconpw pwgen 15 1 >"$CONFIG/rconpw"
fi fi
if [ ! -f $CONFIG/server-settings.json ]; then if [ ! -f "$CONFIG/server-settings.json" ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
fi fi
if [ ! -f $CONFIG/map-gen-settings.json ]; then if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
fi fi
if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then if ! find -L "$SAVES" -iname \*.zip -mindepth 1 -print | grep -q .; then
/opt/factorio/bin/x64/factorio \ /opt/factorio/bin/x64/factorio \
--create $SAVES/_autosave1.zip \ --create "$SAVES/_autosave1.zip" \
--map-gen-settings $CONFIG/map-gen-settings.json --map-gen-settings "$CONFIG/map-gen-settings.json"
fi fi
exec /opt/factorio/bin/x64/factorio \ exec /opt/factorio/bin/x64/factorio \
@ -32,4 +32,4 @@ exec /opt/factorio/bin/x64/factorio \
--start-server-load-latest \ --start-server-load-latest \
--server-settings $CONFIG/server-settings.json \ --server-settings $CONFIG/server-settings.json \
--rcon-port 27015 \ --rcon-port 27015 \
--rcon-password "$(cat $CONFIG/rconpw)" --rcon-password "$(cat "$CONFIG/rconpw")"

1
0.14/run.sh
View File

@ -1,3 +1,4 @@
#!/bin/sh
sudo docker run --rm -it \ sudo docker run --rm -it \
-v /tmp/factorio:/factorio \ -v /tmp/factorio:/factorio \
--name factorio \ --name factorio \

42
0.15/docker-entrypoint.sh
View File

@ -1,43 +1,43 @@
#!/bin/sh -x #!/bin/sh -x
set -e set -euo pipefail
SAVES=/factorio/saves SAVES=/factorio/saves
CONFIG=/factorio/config CONFIG=/factorio/config
mkdir -p $SAVES mkdir -p "$SAVES"
mkdir -p /factorio/mods mkdir -p /factorio/mods
mkdir -p $CONFIG mkdir -p "$CONFIG"
if [ ! -f $CONFIG/rconpw ]; then if [ ! -f "$CONFIG/rconpw" ]; then
echo $(pwgen 15 1) > $CONFIG/rconpw pwgen 15 1 >"$CONFIG/rconpw"
fi fi
if [ ! -f $CONFIG/server-settings.json ]; then if [ ! -f "$CONFIG/server-settings.json" ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
fi fi
if [ ! -f $CONFIG/map-gen-settings.json ]; then if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
fi fi
if [ ! -f $CONFIG/map-settings.json ]; then if [ ! -f "$CONFIG/map-settings.json" ]; then
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
fi fi
if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then if ! find -L "$SAVES" -iname \*.zip -mindepth 1 -print | grep -q .; then
/opt/factorio/bin/x64/factorio \ /opt/factorio/bin/x64/factorio \
--create $SAVES/_autosave1.zip \ --create "$SAVES/_autosave1.zip" \
--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"
fi fi
exec /opt/factorio/bin/x64/factorio \ exec /opt/factorio/bin/x64/factorio \
--port $PORT \ --port "$PORT" \
--start-server-load-latest \ --start-server-load-latest \
--server-settings $CONFIG/server-settings.json \ --server-settings "$CONFIG/server-settings.json" \
--server-whitelist $CONFIG/server-whitelist.json \ --server-whitelist "$CONFIG/server-whitelist.json" \
--server-banlist $CONFIG/server-banlist.json \ --server-banlist "$CONFIG/server-banlist.json" \
--rcon-port $RCON_PORT \ --rcon-port "$RCON_PORT" \
--rcon-password "$(cat $CONFIG/rconpw)" \ --rcon-password "$(cat "$CONFIG/rconpw")" \
--server-id /factorio/config/server-id.json --server-id /factorio/config/server-id.json

54
0.16/files/docker-entrypoint.sh
View File

@ -1,48 +1,48 @@
#!/bin/sh -x #!/bin/sh -x
set -e set -euo pipefail
id id
mkdir -p $SAVES mkdir -p "$SAVES"
mkdir -p $CONFIG mkdir -p "$CONFIG"
mkdir -p $MODS mkdir -p "$MODS"
mkdir -p $SCENARIOS mkdir -p "$SCENARIOS"
mkdir -p $SCRIPTOUTPUT mkdir -p "$SCRIPTOUTPUT"
if [ ! -f $CONFIG/rconpw ]; then if [ ! -f "$CONFIG/rconpw" ]; then
echo $(pwgen 15 1) > $CONFIG/rconpw pwgen 15 1>"$CONFIG/rconpw"
fi fi
if [ ! -f $CONFIG/server-settings.json ]; then if [ ! -f "$CONFIG/server-settings.json" ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
fi fi
if [ ! -f $CONFIG/map-gen-settings.json ]; then if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
fi fi
if [ ! -f $CONFIG/map-settings.json ]; then if [ ! -f "$CONFIG/map-settings.json" ]; then
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
fi fi
if find -L $SAVES -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then if find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then
rm -f $SAVES/*.tmp.zip rm -f "$SAVES/*.tmp.zip"
fi fi
if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then if ! find -L "$SAVES" -iname \*.zip -mindepth 1 -print | grep -q .; then
/opt/factorio/bin/x64/factorio \ /opt/factorio/bin/x64/factorio \
--create $SAVES/_autosave1.zip \ --create "$SAVES/_autosave1.zip" \
--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"
fi fi
exec /opt/factorio/bin/x64/factorio \ exec /opt/factorio/bin/x64/factorio \
--port $PORT \ --port "$PORT" \
--start-server-load-latest \ --start-server-load-latest \
--server-settings $CONFIG/server-settings.json \ --server-settings "$CONFIG/server-settings.json" \
--server-whitelist $CONFIG/server-whitelist.json \ --server-whitelist "$CONFIG/server-whitelist.json" \
--server-banlist $CONFIG/server-banlist.json \ --server-banlist "$CONFIG/server-banlist.json" \
--rcon-port $RCON_PORT \ --rcon-port "$RCON_PORT" \
--rcon-password "$(cat $CONFIG/rconpw)" \ --rcon-password "$(cat "$CONFIG/rconpw")" \
--server-id /factorio/config/server-id.json \ --server-id /factorio/config/server-id.json \
$@ "$@"

46
0.16/files/scenario.sh
View File

@ -1,44 +1,42 @@
#!/bin/sh -x #!/bin/sh -x
if [ -z "$1" ] if [ -z "$1" ]; then
then echo "No argument supplied"
echo "No argument supplied"
fi fi
SCENARIO=$1 SCENARIO=$1
set -e set -euo pipefail
id id
mkdir -p $SAVES mkdir -p "$SAVES"
mkdir -p $CONFIG mkdir -p "$CONFIG"
mkdir -p $MODS mkdir -p "$MODS"
mkdir -p $SCENARIOS mkdir -p "$SCENARIO"
#chown -R factorio /factorio #chown -R factorio /factorio
if [ ! -f $CONFIG/rconpw ]; then if [ ! -f "$CONFIG/rconpw" ]; then
echo $(pwgen 15 1) > $CONFIG/rconpw pwgen 15 1 >"$CONFIG/rconpw"
fi fi
if [ ! -f $CONFIG/server-settings.json ]; then if [ ! -f "$CONFIG/server-settings.json" ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
fi fi
if [ ! -f $CONFIG/map-gen-settings.json ]; then if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
fi fi
if [ ! -f $CONFIG/map-settings.json ]; then if [ ! -f "$CONFIG/map-settings.json" ]; then
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
fi fi
exec /opt/factorio/bin/x64/factorio \ exec /opt/factorio/bin/x64/factorio \
--port $PORT \ --port "$PORT" \
--start-server-load-scenario $SCENARIO \ --start-server-load-scenario "$SCENARIO" \
--server-settings $CONFIG/server-settings.json \ --server-settings "$CONFIG/server-settings.json" \
--server-whitelist $CONFIG/server-whitelist.json \ --server-whitelist "$CONFIG/server-whitelist.json" \
--server-banlist $CONFIG/server-banlist.json \ --server-banlist "$CONFIG/server-banlist.json" \
--rcon-port $RCON_PORT \ --rcon-port "$RCON_PORT" \
--rcon-password "$(cat $CONFIG/rconpw)" \ --rcon-password "$(cat "$CONFIG/rconpw")" \
--server-id /factorio/config/server-id.json --server-id /factorio/config/server-id.json

29
0.16/files/scenario2map.sh
View File

@ -1,30 +1,29 @@
#!/bin/sh -x #!/bin/sh -x
if [ -z "$1" ] if [ -z "$1" ]; then
then echo "No argument supplied"
echo "No argument supplied"
fi fi
SCENARIO=$1 SCENARIO=$1
set -e set -euo pipefail
id id
mkdir -p $SAVES mkdir -p "$SAVES"
mkdir -p $CONFIG mkdir -p "$CONFIG"
mkdir -p $MODS mkdir -p "$MODS"
mkdir -p $SCENARIOS mkdir -p "$SCENARIO"
if [ ! -f $CONFIG/server-settings.json ]; then if [ ! -f "$CONFIG/server-settings.json" ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
fi fi
if [ ! -f $CONFIG/map-gen-settings.json ]; then if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
fi fi
if [ ! -f $CONFIG/map-settings.json ]; then if [ ! -f "$CONFIG/map-settings.json" ]; then
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
fi fi
exec /opt/factorio/bin/x64/factorio \ exec /opt/factorio/bin/x64/factorio \
--scenario2map $SCENARIO --scenario2map "$SCENARIO"

70
0.17/files/docker-entrypoint.sh
View File

@ -1,69 +1,69 @@
#!/bin/sh -x #!/bin/sh -x
set -e set -euo pipefail
id id
FACTORIO_VOL=/factorio FACTORIO_VOL=/factorio
mkdir -p $FACTORIO_VOL mkdir -p "$FACTORIO_VOL"
mkdir -p $SAVES mkdir -p "$SAVES"
mkdir -p $CONFIG mkdir -p "$CONFIG"
mkdir -p $MODS mkdir -p "$MODS"
mkdir -p $SCENARIOS mkdir -p "$SCENARIOS"
mkdir -p $SCRIPTOUTPUT mkdir -p "$SCRIPTOUTPUT"
if [ ! -f $CONFIG/rconpw ]; then if [ ! -f "$CONFIG/rconpw" ]; then
# Generate a new RCON password if none exists # Generate a new RCON password if none exists
echo $(pwgen 15 1) > $CONFIG/rconpw pwgen 15 1 >"$CONFIG/rconpw"
fi fi
if [ ! -f $CONFIG/server-settings.json ]; then if [ ! -f "$CONFIG/server-settings.json" ]; then
# Copy default settings if server-settings.json doesn't exist # Copy default settings if server-settings.json doesn't exist
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
fi fi
if [ ! -f $CONFIG/map-gen-settings.json ]; then if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
fi fi
if [ ! -f $CONFIG/map-settings.json ]; then if [ ! -f "$CONFIG/map-settings.json" ]; then
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
fi fi
if find -L $SAVES -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then if find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then
# Delete incomplete saves (such as after a forced exit) # Delete incomplete saves (such as after a forced exit)
rm -f $SAVES/*.tmp.zip rm -f "$SAVES/*.tmp.zip"
fi fi
if [ "$(id -u)" = '0' ]; then if [ "$(id -u)" = '0' ]; then
# Update the User and Group ID based on the PUID/PGID variables # Update the User and Group ID based on the PUID/PGID variables
usermod -o -u $PUID factorio usermod -o -u "$PUID" factorio
groupmod -o -g $PGID factorio groupmod -o -g "$PGID" factorio
# Take ownership of factorio data if running as root # Take ownership of factorio data if running as root
chown -R factorio:factorio $FACTORIO_VOL chown -R factorio:factorio $FACTORIO_VOL
# Make sure we own temp
#mkdir -p /opt/factorio/temp
#chown -R factorio:factorio /opt/factorio/temp
# Drop to the factorio user # Drop to the factorio user
SU_EXEC="su-exec factorio" SU_EXEC="su-exec factorio"
else
SU_EXEC=""
fi fi
if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then if ! find -L "$SAVES" -iname \*.zip -mindepth 1 -print | grep -q .; then
# Generate a new map if no save ZIPs exist # Generate a new map if no save ZIPs exist
${SU_EXEC} /opt/factorio/bin/x64/factorio \ $SU_EXEC /opt/factorio/bin/x64/factorio \
--create $SAVES/_autosave1.zip \ --create "$SAVES/_autosave1.zip" \
--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"
fi fi
exec ${SU_EXEC} /opt/factorio/bin/x64/factorio \ # shellcheck disable=SC2086
--port $PORT \ exec $SU_EXEC /opt/factorio/bin/x64/factorio \
--port "$PORT" \
--start-server-load-latest \ --start-server-load-latest \
--server-settings $CONFIG/server-settings.json \ --server-settings "$CONFIG/server-settings.json" \
--server-banlist $CONFIG/server-banlist.json \ --server-banlist "$CONFIG/server-banlist.json" \
--rcon-port $RCON_PORT \ --rcon-port "$RCON_PORT" \
--server-whitelist $CONFIG/server-whitelist.json \ --server-whitelist "$CONFIG/server-whitelist.json" \
--use-server-whitelist \ --use-server-whitelist \
--server-adminlist $CONFIG/server-adminlist.json \ --server-adminlist "$CONFIG/server-adminlist.json" \
--rcon-password "$(cat $CONFIG/rconpw)" \ --rcon-password "$(cat "$CONFIG/rconpw")" \
--server-id /factorio/config/server-id.json \ --server-id /factorio/config/server-id.json \
"$@" "$@"

48
0.17/files/scenario.sh
View File

@ -1,44 +1,42 @@
#!/bin/sh -x #!/bin/sh -x
if [ -z "$1" ] if [ -z "$1" ]; then
then echo "No argument supplied"
echo "No argument supplied"
fi fi
SCENARIO=$1 SCENARIO="$1"
set -e set -euo pipefail
id id
mkdir -p $SAVES mkdir -p "$SAVES"
mkdir -p $CONFIG mkdir -p "$CONFIG"
mkdir -p $MODS mkdir -p "$MODS"
mkdir -p $SCENARIOS mkdir -p "$SCENARIO"
#chown -R factorio /factorio #chown -R factorio /factorio
if [ ! -f $CONFIG/rconpw ]; then if [ ! -f "$CONFIG/rconpw" ]; then
echo $(pwgen 15 1) > $CONFIG/rconpw pwgen 15 1 >"$CONFIG/rconpw"
fi fi
if [ ! -f $CONFIG/server-settings.json ]; then if [ ! -f "$CONFIG/server-settings.json" ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
fi fi
if [ ! -f $CONFIG/map-gen-settings.json ]; then if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
fi fi
if [ ! -f $CONFIG/map-settings.json ]; then if [ ! -f "$CONFIG/map-settings.json" ]; then
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
fi fi
exec /opt/factorio/bin/x64/factorio \ exec /opt/factorio/bin/x64/factorio \
--port $PORT \ --port "$PORT" \
--start-server-load-scenario $SCENARIO \ --start-server-load-scenario "$SCENARIO" \
--server-settings $CONFIG/server-settings.json \ --server-settings "$CONFIG/server-settings.json" \
--server-whitelist $CONFIG/server-whitelist.json \ --server-whitelist "$CONFIG/server-whitelist.json" \
--server-banlist $CONFIG/server-banlist.json \ --server-banlist "$CONFIG/server-banlist.json" \
--rcon-port $RCON_PORT \ --rcon-port "$RCON_PORT" \
--rcon-password "$(cat $CONFIG/rconpw)" \ --rcon-password "$(cat "$CONFIG/rconpw")" \
--server-id /factorio/config/server-id.json --server-id /factorio/config/server-id.json

31
0.17/files/scenario2map.sh
View File

@ -1,30 +1,29 @@
#!/bin/sh -x #!/bin/sh -x
if [ -z "$1" ] if [ -z "$1" ]; then
then echo "No argument supplied"
echo "No argument supplied"
fi fi
SCENARIO=$1 SCENARIO="$1"
set -e set -euo pipefail
id id
mkdir -p $SAVES mkdir -p "$SAVES"
mkdir -p $CONFIG mkdir -p "$CONFIG"
mkdir -p $MODS mkdir -p "$MODS"
mkdir -p $SCENARIOS mkdir -p "$SCENARIO"
if [ ! -f $CONFIG/server-settings.json ]; then if [ ! -f "$CONFIG/server-settings.json" ]; then
cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json cp /opt/factorio/data/server-settings.example.json "$CONFIG/server-settings.json"
fi fi
if [ ! -f $CONFIG/map-gen-settings.json ]; then if [ ! -f "$CONFIG/map-gen-settings.json" ]; then
cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json cp /opt/factorio/data/map-gen-settings.example.json "$CONFIG/map-gen-settings.json"
fi fi
if [ ! -f $CONFIG/map-settings.json ]; then if [ ! -f "$CONFIG/map-settings.json" ]; then
cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
fi fi
exec /opt/factorio/bin/x64/factorio \ exec /opt/factorio/bin/x64/factorio \
--scenario2map $SCENARIO --scenario2map "$SCENARIO"