Merge pull request #193 from DBendit/0.17.3

0.17.3

0.17/Dockerfile

@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.17.1 \
-    SHA1=cab0b48a5ddb1870bab2c07cc6ad5726097c1fc5 \
+    VERSION=0.17.3 \
+    SHA1=df70827c7f3e39ee3443de4d8c10f30f71973fdf \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \
@@ -18,7 +18,7 @@ ENV PORT=34197 \
     SCRIPTOUTPUT=/factorio/script-output
 
 RUN mkdir -p /opt /factorio && \
-    apk add --update --no-cache pwgen su-exec && \
+    apk add --update --no-cache pwgen su-exec binutils && \
     apk add --update --no-cache --virtual .build-deps curl && \
     curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
         -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \

0.17/docker-compose.yml

@@ -7,3 +7,5 @@ services:
      - "27015:27015/tcp"
     volumes:
      - /opt/factorio:/factorio
+#    user: 845:845
+#    user: 1000:1000

0.17/files/docker-entrypoint.sh

@@ -2,7 +2,7 @@
 set -e
 
 id
-#
+
 FACTORIO_VOL=/factorio
 mkdir -p $FACTORIO_VOL
 mkdir -p $SAVES
@@ -12,15 +12,17 @@ mkdir -p $SCENARIOS
 mkdir -p $SCRIPTOUTPUT
 
 if [ ! -f $CONFIG/rconpw ]; then
+  # Generate a new RCON password if none exists
   echo $(pwgen 15 1) > $CONFIG/rconpw
 fi
 
 if [ ! -f $CONFIG/server-settings.json ]; then
+  # Copy default settings if server-settings.json doesn't exist
   cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
 fi
 
 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
   echo "{}" > $CONFIG/map-gen-settings.json
 fi
 
@@ -29,21 +31,29 @@ if [ ! -f $CONFIG/map-settings.json ]; then
 fi
 
 if find -L $SAVES -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then
+  # Delete incomplete saves (such as after a forced exit)
   rm -f $SAVES/*.tmp.zip
 fi
 
+if [ "$(id -u)" = '0' ]; then
+  # Take ownership of factorio data if running as root
+  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
+  SU_EXEC="su-exec factorio"
+fi
+
 if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
-  /opt/factorio/bin/x64/factorio \
+  # Generate a new map if no save ZIPs exist
+  ${SU_EXEC} /opt/factorio/bin/x64/factorio \
     --create $SAVES/_autosave1.zip  \
     --map-gen-settings $CONFIG/map-gen-settings.json \
     --map-settings $CONFIG/map-settings.json
 fi
 
-if [ "$(id -u)" = '0' ]; then
-  chown -R factorio:factorio $FACTORIO_VOL
-fi
-
-exec su-exec factorio /opt/factorio/bin/x64/factorio \
+exec ${SU_EXEC} /opt/factorio/bin/x64/factorio \
   --port $PORT \
   --start-server-load-latest \
   --server-settings $CONFIG/server-settings.json \
@@ -55,4 +65,4 @@ exec su-exec factorio /opt/factorio/bin/x64/factorio \
   --server-banlist $CONFIG/server-banlist.json \
   --rcon-password "$(cat $CONFIG/rconpw)" \
   --server-id /factorio/config/server-id.json \
-  $@
+  "$@"

README.md

@@ -1,6 +1,6 @@
 # Factorio [![](https://images.microbadger.com/badges/image/dtandersen/factorio.svg)](https://microbadger.com/images/dtandersen/factorio "Get your own image badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/dtandersen/factorio.svg)](https://hub.docker.com/r/dtandersen/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/dtandersen/factorio.svg)](https://hub.docker.com/r/dtandersen/factorio/)
 
-* `0.17.1`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.17/Dockerfile)
+* `0.17.3`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.17/Dockerfile)
 * `0.16.51`, `0.16`, `stable` [(0.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.16/Dockerfile)
 * `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
 * `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.14/Dockerfile)