Merge pull request #76 from dtandersen/update-0.15.36

Updated to version 0.15.36

0.15/Dockerfile

@@ -1,21 +1,22 @@
-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.0 \
+    VERSION=0.15.36 \
-    SHA1=e7681725203afeb0645371c695989129076e51bc
+    SHA1=95bc578f48768f44c3a6c38005a038740de4951a
 
 RUN mkdir /opt && \
-    apk --no-cache add curl tini pwgen && \
+    apk add --update --no-cache tini pwgen && \
+    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 && \
     echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
     tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
     rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
-    apk del curl && \
     ln -s /factorio/saves /opt/factorio/saves && \
-    ln -s /factorio/mods /opt/factorio/mods
+    ln -s /factorio/mods /opt/factorio/mods && \
+    apk del .build-deps
 
 VOLUME /factorio
 

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,15 +21,23 @@ 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 \
   --port $PORT \
   --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

README.md

@@ -1,15 +1,18 @@
-# Factorio [![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/)
+# 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.0`, `0.15`, `latest` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
+* `0.15.36`, `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.15.36`, `stable` [(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)
 
-*Tag philosophy*
+*Tag descriptions*
 
 * `latest` - highest version: may be experimental.
 * `stable` - highest version declared stable.
 * `0.x` - highest version in a branch: may be experimental.
 * `0.x.y` - a specific version.
+* `0.x-dev` - whatever is in master for that version.
+
 
 # What is Factorio?
 
@@ -65,9 +68,34 @@ docker start factorio
 Try to connect to the server. Check the logs if it isn't working.
 
 
+## Console
+
+To issue console commands to the server, start the server in interactive mode with `-it`. Open the console with `docker attach` and then type commands.
+
+	docker run -d -it  \
+        --name factorio \
+        dtandersen/factorio
+	docker attach factorio
+
+
+## Upgrading
+
+Before upgrading backup the save. It's easy to make a save in the client.
+
+Ensure `-v` was used to run the server so the save is outside of the Docker container. The `docker rm` command completely destroys the container, which includes the save if it isn't stored in an data volume.
+
+Delete the container and refresh the image:
+
+	docker stop factorio
+	docker rm factorio
+	docker pull dtandersen/factorio
+
+Now run the server as before. In about a minute the new version of Factorio should be up and running, complete with saves and config!
+
+
 ## 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.
 
@@ -83,11 +111,20 @@ Copy mods into the mods folder and restart the server.
 
 Set the RCON password in the `rconpw` file. A random password is generated if `rconpw` doesn't exist.
 
-To change the password stop the server, modify `rconpw`, and restart the server.
+To change the password, stop the server, modify `rconpw`, and restart the server.
 
-To "disable" RCON don't expose port 27015, i.e. start the server with `-p 34197:34197/udp` instead of `-P`. RCON still runs, but nobody is able to connect to it.
+To "disable" RCON don't expose port 27015, i.e. start the server without `-p 27015:27015/tcp`. RCON is still running, but nobody can to connect to it.
 
 
+## Whitelisting (0.15.3+)
+
+Create file `config/server-whitelist.json` and add the whitelisted users.
+
+    [
+		"you",
+		"friend"
+	]
+
 # Container Details
 
 The philosophy is to [keep it simple](http://wiki.c2.com/?KeepItSimple).
@@ -105,7 +142,8 @@ To keep things simple, the container uses a single volume mounted at `/factorio`
     |-- config
     |   |-- map-gen-settings.json
     |   |-- rconpw
-    |   `-- server-settings.json
+    |   |-- server-settings.json
+    |   `-- server-whitelist.json
     |-- mods
     |   `-- fancymod.zip
     `-- saves
@@ -114,10 +152,15 @@ To keep things simple, the container uses a single volume mounted at `/factorio`
 
 ## Ports
 
-* `34197/udp` - Factorio clients (required).
+* `34197/udp` - Game server (required).
 * `27015/tcp` - RCON (optional).
 
 
+## Environment Variables
+
+* `PORT` (0.15+) - Start the server on an alterate port, .e.g. `docker run -e "PORT=34198"`.
+
+
 ## Troubleshooting
 
 **My server is listed in the server browser, but nobody can connect**
@@ -128,10 +171,15 @@ By default, Docker routes traffic through a proxy. The proxy changes the source
 
 To fix the incorrect port, start the Docker service with the `--userland-proxy=false` switch. Docker will route traffic with iptables rules instead of a proxy. Add the switch to the `DOCKER_OPTS` environment variable or `ExecStart` in the Docker systemd service definition. The specifics vary by operating system.
 
+**When I run a server on a port besides 34197 nobody can connect from the server browser**
 
-# Credits
+Use the `PORT` environment variable to start the server on the a different port, .e.g. `docker run -e "PORT=34198"`. This changes the source port on the packets used for port detection. `-p 34198:34197` works fine for private servers, but the server browser detects the wrong port.
 
-Ideas borrowed from:
 
-* [Zopanix](https://github.com/zopanix/docker_factorio_server)
+# Contributors
-* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio)
+
+* [dtandersen](https://github.com/dtandersen/docker_factorio_server) - Maintainer
+* [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
+* [jaredledvina](https://github.com/jaredledvina/docker_factorio_server) - Version update