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.2 \
-    SHA1=0f0931e3444befcd5e37abe912551f75f681c4ca \
+    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 && \
@@ -34,10 +34,6 @@ RUN mkdir -p /opt /factorio && \
     addgroup -g $PGID -S $GROUP && \
     adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER && \
     chown -R $USER:$GROUP /opt/factorio /factorio
-#    mkdir -p /opt/factorio/temp && \
-#    chmod 777 -R /opt/factorio/temp && \
-#    mkdir -p /opt/factorio/temp && \
-#    chmod 777 -R /opt/factorio/temp && \
 
 VOLUME /factorio
 

0.17/files/docker-entrypoint.sh

@@ -22,8 +22,7 @@ if [ ! -f $CONFIG/server-settings.json ]; then
 fi
 
 if [ ! -f $CONFIG/map-gen-settings.json ]; then
-  # TODO: Need a valid map-gen-settings.json
-  # 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
 
@@ -36,23 +35,24 @@ if find -L $SAVES -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then
   rm -f $SAVES/*.tmp.zip
 fi
 
-if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
-  # Generate a new map if no save ZIPs exist
-  /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
   # Take ownership of factorio data if running as root
   chown -R factorio:factorio $FACTORIO_VOL
   # Make sure we own temp
-  chown -R factorio:factorio /opt/factorio/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
+  # 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
+
 exec ${SU_EXEC} /opt/factorio/bin/x64/factorio \
   --port $PORT \
   --start-server-load-latest \

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.2`, `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)