update to 0.16.51

Expose script-output to mounted volume

0.16/Dockerfile

@@ -9,13 +9,13 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.16.30 \
-    SHA1=7ceac7d3cfee2c301707e2622400d2c7bc6f2e8c \
+    VERSION=0.16.51 \
+    SHA1=127e7ff484ab263b13615d6114013ce0a66ac929 \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \
     SCENARIOS=/factorio/scenarios \
-    ENTRYPOINTS=/factorio/entrypoints
+    SCRIPTOUTPUT=/factorio/script-output
 
 RUN mkdir -p /opt /factorio && \
     apk add --update --no-cache pwgen && \
@@ -26,10 +26,10 @@ RUN mkdir -p /opt /factorio && \
     tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
     chmod ugo=rwx /opt/factorio && \
     rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
-    ln -s -f $SAVES /opt/factorio/saves && \
-    ln -s -f $MODS /opt/factorio/mods && \
-    ln -s -f $SCENARIOS /opt/factorio/scenarios && \
-    ln -s -f $ENTRYPOINTS /opt/factorio/entrypoints && \
+    ln -s $SAVES /opt/factorio/saves && \
+    ln -s $MODS /opt/factorio/mods && \
+    ln -s $SCENARIOS /opt/factorio/scenarios && \
+    ln -s $SCRIPTOUTPUT /opt/factorio/script-output && \
     apk del .build-deps && \
     addgroup -g $PGID -S $GROUP && \
     adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER && \
@@ -39,12 +39,7 @@ VOLUME /factorio
 
 EXPOSE $PORT/udp $RCON_PORT/tcp
 
-COPY ./docker-entrypoint.sh /
-COPY ./scenario2map.sh /factorio/entrypoints
-COPY ./scenario.sh /factorio/entrypoints
-
-#symbolic link the default entrypoint to the entrypoints directory so it can be inspected and copied to new entrypoints
-#RUN ln -s -f /docker-entrypoint.sh $ENTRYPOINTS/docker-entrypoint.sh
+COPY files/ /
 
 USER $USER
 

0.16/files/docker-entrypoint.sh

@@ -1,5 +1,4 @@
 #!/bin/sh -x
-
 set -e
 
 id
@@ -8,9 +7,7 @@ mkdir -p $SAVES
 mkdir -p $CONFIG
 mkdir -p $MODS
 mkdir -p $SCENARIOS
-mkdir -p $ENTRYPOINTS
-
-#chown -R factorio /factorio
+mkdir -p $SCRIPTOUTPUT
 
 if [ ! -f $CONFIG/rconpw ]; then
   echo $(pwgen 15 1) > $CONFIG/rconpw
@@ -28,6 +25,10 @@ if [ ! -f $CONFIG/map-settings.json ]; then
   cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json
 fi
 
+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
   /opt/factorio/bin/x64/factorio \
     --create $SAVES/_autosave1.zip  \
@@ -43,4 +44,5 @@ exec /opt/factorio/bin/x64/factorio \
   --server-banlist $CONFIG/server-banlist.json \
   --rcon-port $RCON_PORT \
   --rcon-password "$(cat $CONFIG/rconpw)" \
-  --server-id /factorio/config/server-id.json
+  --server-id /factorio/config/server-id.json \
+  $@

0.16/files/scenario.sh

@@ -9,11 +9,6 @@ set -e
 
 id
 
-SAVES=/factorio/saves
-CONFIG=/factorio/config
-MODS=/factorio/mods
-SCENARIOS=/factorio/scenarios
-
 mkdir -p $SAVES
 mkdir -p $CONFIG
 mkdir -p $MODS

0.16/files/scenario2map.sh

@@ -9,18 +9,11 @@ set -e
 
 id
 
-SAVES=/factorio/saves
-CONFIG=/factorio/config
-MODS=/factorio/mods
-SCENARIOS=/factorio/scenarios
-
 mkdir -p $SAVES
 mkdir -p $CONFIG
 mkdir -p $MODS
 mkdir -p $SCENARIOS
 
-#chown -R factorio /factorio
-
 if [ ! -f $CONFIG/server-settings.json ]; then
   cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
 fi

README.md

@@ -1,7 +1,7 @@
 # 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.16.30`, `0.16`, `latest` [(0.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.16/Dockerfile)
-* `0.15.40`, `0.15`, `stable` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
+* `0.16.51`, `0.16`, `stable`, `latest` [(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)
 * `0.13.20`, `0.13`  [(0.13/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.13/Dockerfile)
 
@@ -39,7 +39,7 @@ sudo docker run -d \
   -p 27015:27015/tcp \
   -v /opt/factorio:/factorio \
   --name factorio \
-  --restart=always  \
+  --restart=always \
   dtandersen/factorio
 ```
 
@@ -124,14 +124,14 @@ docker run -d \
   -v /opt/factorio:/factorio \
   --name factorio \
   --restart=always  \
-  --entrypoint "/factorio/entrypoints/scenario.sh" \
+  --entrypoint "/scenario.sh" \
   dtandersen/factorio \
   MyScenarioName
 ```
 
 ## Converting Scenarios to Regular Maps
 
-If you would like to export your scenario to a saved map, you can use the example entrypoint similar to the Scenario usag above. Factorio will run once, converting the Scenario to a saved Map in your saves directory. A restart of the docker image using the standard options will then load that map, just as if the scenario were just started by the Scenarios example noted above. 
+If you would like to export your scenario to a saved map, you can use the example entrypoint similar to the Scenario usag above. Factorio will run once, converting the Scenario to a saved Map in your saves directory. A restart of the docker image using the standard options will then load that map, just as if the scenario were just started by the Scenarios example noted above.
 
 ```
 docker run -d \
@@ -140,7 +140,7 @@ docker run -d \
   -v /opt/factorio:/factorio \
   --name factorio \
   --restart=always  \
-  --entrypoint "/factorio/entrypoints/scenario2map.sh" \
+  --entrypoint "/scenario2map.sh" \
   dtandersen/factorio
   MyScenarioName
 ```