Merge pull request #61 from dtandersen/update-0.15.27

Updated to version 0.15.27

0.15/Dockerfile

@@ -1,10 +1,10 @@
-FROM frolvlad/alpine-glibc:alpine-3.5
+FROM frolvlad/alpine-glibc:alpine-3.6
 
 MAINTAINER https://github.com/dtandersen/docker_factorio_server
 
 ENV PORT=34197 \
-    VERSION=0.15.3 \
-    SHA1=5b6b8c150c9f25a5c4ed470cdd732753ab7ad67e
+    VERSION=0.15.27 \
+    SHA1=7bc20a702710672ff4a570948ffc06b6f7d4666c
 
 RUN mkdir /opt && \
     apk add --update --no-cache tini pwgen && \

0.15/build.sh

@@ -1 +0,0 @@
-sudo docker build --no-cache -t factorio .

0.15/clean.sh

@@ -1 +0,0 @@
-sudo rm -rf /tmp/factorio

0.15/docker-compose.yml

@@ -0,0 +1,8 @@
+version: '2'
+services:
+  factorio:
+    build: .
+    ports:
+     - "34197:34197"
+    volumes:
+     - /tmp/factorio:/factorio

0.15/docker-entrypoint.sh

@@ -21,10 +21,15 @@ if [ ! -f $CONFIG/map-gen-settings.json ]; then
   cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
 fi
 
+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 \*.zip -mindepth 1 -print | grep -q .; then
   /opt/factorio/bin/x64/factorio \
     --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
 fi
 
 exec /opt/factorio/bin/x64/factorio \
@@ -32,5 +37,7 @@ exec /opt/factorio/bin/x64/factorio \
   --start-server-load-latest \
   --server-settings $CONFIG/server-settings.json \
   --server-whitelist $CONFIG/server-whitelist.json \
+  --server-banlist $CONFIG/server-banlist.json \
   --rcon-port 27015 \
-  --rcon-password "$(cat $CONFIG/rconpw)"
+  --rcon-password "$(cat $CONFIG/rconpw)" \
+  --server-id /factorio/config/server-id.json

0.15/run.sh

@@ -1,5 +0,0 @@
-sudo docker run --rm -it \
-	-v /tmp/factorio:/factorio \
-	--name factorio \
-	factorio "$@"
-find /tmp/factorio -type f

0.15/start.sh

@@ -1,5 +0,0 @@
-sudo docker run -d -p 34197:34197/udp -p 27015:27015/tcp \
-  -v factorio:/factorio \
-  --name factorio \
-  --restart=always  \
-  factorio

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.15.3`, `0.15`, `latest` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
+* `0.15.27`, `0.15`, `latest` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
 * `0.14.23`, `0.14`, `stable` [(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)
 
@@ -94,7 +94,7 @@ Now run the server as before. In about a minute the new version of Factorio shou
 
 ## Saves
 
-A new map named `_autosave1.zip` is generated the first time the server is started. The `map-gen-settings.json` file in `/tmp/factorio/config` is used for the map settings. On subsequent runs the newest save is used.
+A new map named `_autosave1.zip` is generated the first time the server is started. The `map-gen-settings.json` and `map-settings.json` files in `/tmp/factorio/config` are used for the map settings. On subsequent runs the newest save is used.
 
 To load an old save stop the server and run the command `touch oldsave.zip`. This resets the date. Then restart the server. Another option is to delete all saves except one.