update to 0.17.15

Update to 0.17.13

0.17/Dockerfile

@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.17.4 \
-    SHA1=30a7387e0450ecda8a48a9b56b18058c3f8a9f69 \
+    VERSION=0.17.15 \
+    SHA1=be8d9ff72b1302366c762254b33c1daaccf44f78 \
     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 binutils && \
+    apk add --update --no-cache pwgen su-exec binutils gettext libintl && \
     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/files/docker-entrypoint.sh

@@ -23,7 +23,6 @@ fi
 
 if [ ! -f $CONFIG/map-gen-settings.json ]; then
   cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
-  echo "{}" > $CONFIG/map-gen-settings.json
 fi
 
 if [ ! -f $CONFIG/map-settings.json ]; then
@@ -62,7 +61,6 @@ exec ${SU_EXEC} /opt/factorio/bin/x64/factorio \
   --server-whitelist $CONFIG/server-whitelist.json \
   --use-server-whitelist \
   --server-adminlist $CONFIG/server-adminlist.json \
-  --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.4`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.17/Dockerfile)
+* `0.17.15`, `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)
@@ -182,6 +182,31 @@ Create file `config/server-adminlist.json` and add the adminlisted users.
         "friend"
     ]
 
+## Customize configuration files (0.17.x+)
+
+Out-of-the box, factorio does not support environment variables inside the configuration files. A workaround is the usage of `envsubst` which generates the configuration files dynamically during startup from environment variables set in docker-compose:
+
+Example which replaces the server-settings.json:
+
+
+	factorio_1:
+	  image: dtanders/factorio
+	  ports:
+	    - "34197:34197/udp"
+	  volumes:
+	   - /opt/factorio:/factorio
+	   - ./server-settings.json:/server-settings.json
+	  environment:
+	    - INSTANCE_NAME=Your Instance's Name
+	    - INSTANCE_DESC=Your Instance's Description
+	  entrypoint: /bin/sh -c "mkdir -p /factorio/config && envsubst < /server-settings.json > /factorio/config/server-settings.json && exec /docker-entrypoint.sh"
+
+The `server-settings.json` file may then contain the variable references like this:
+
+	"name": "${INSTANCE_NAME}",
+	"description": "${INSTANCE_DESC}",
+
+
 # Container Details
 
 The philosophy is to [keep it simple](http://wiki.c2.com/?KeepItSimple).
@@ -312,6 +337,7 @@ Use the `PORT` environment variable to start the server on the a different port,
 
 * [dtandersen](https://github.com/dtandersen/docker_factorio_server) - Maintainer
 * [Fank](https://github.com/Fankserver/docker-factorio-watchdog) - Keeper of the Factorio watchdog that keeps the version up-to-date.
+* [DBendit](https://github.com/DBendit/docker_factorio_server) - Admin list, ban list, version updates
 * [Zopanix](https://github.com/zopanix/docker_factorio_server) - Originator
 * [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio) - Randomly generate RCON password
 * [gnomus](https://github.com/gnomus/docker_factorio_server) - White listing