move stuff to 0.14

added 0.14 version

0.13/Dockerfile

@@ -1,28 +0,0 @@
-FROM frolvlad/alpine-glibc:alpine-3.4
-
-MAINTAINER https://github.com/dtandersen/docker_factorio_server
-
-COPY ./factorio.crt /opt/factorio.crt
-
-ENV VERSION=0.13.20 \
-    SHA1=59ed0edb3f62f0f41a01fc291959b0a8b44cf631
-
-RUN apk --no-cache add curl tini pwgen && \
-    curl -sSL --cacert /opt/factorio.crt \
-        https://www.factorio.com/get-download/$VERSION/headless/linux64 \
-        -o /tmp/factorio_headless_x64_$VERSION.tar.gz && \
-    echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c && \
-    tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz --directory /opt && \
-    rm /tmp/factorio_headless_x64_$VERSION.tar.gz && \
-    apk del curl && \
-    ln -s /factorio/saves /opt/factorio/saves && \
-    ln -s /factorio/mods /opt/factorio/mods
-
-VOLUME /factorio
-
-EXPOSE 34197/udp 27015/tcp
-
-COPY ./docker-entrypoint.sh /
-
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["/docker-entrypoint.sh"]

0.13/build.sh

@@ -1 +0,0 @@
-sudo docker build -t dtandersen/factorio:0.13-dev .

0.13/clean.sh

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

0.13/docker-entrypoint.sh

@@ -1,35 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-SAVES=/factorio/saves
-CONFIG=/factorio/config
-
-mkdir -p $SAVES
-mkdir -p /factorio/mods
-mkdir -p $CONFIG
-
-if [ ! -f $CONFIG/rconpw ]; then
-  echo $(pwgen 15 1) > $CONFIG/rconpw
-fi
-
-if [ ! -f $CONFIG/server-settings.json ]; then
-  cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
-fi
-
-if [ ! -f $CONFIG/map-gen-settings.json ]; then
-  cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-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
-fi
-
-exec /opt/factorio/bin/x64/factorio \
-  --port 34197 \
-  --start-server-load-latest \
-  --server-settings $CONFIG/server-settings.json \
-  --rcon-port 27015 \
-  --rcon-password "$(cat $CONFIG/rconpw)"

0.13/run.sh

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

0.14/Dockerfile

@@ -2,19 +2,23 @@ FROM frolvlad/alpine-glibc:alpine-3.4
 
 MAINTAINER https://github.com/dtandersen/docker_factorio_server
 
-ENV VERSION=0.14.23 \
+COPY ./factorio.crt /opt/factorio.crt
-    SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a
 
-RUN mkdir /opt && \
+ENV VERSION=0.14.16 \
-    apk --no-cache add curl tini pwgen && \
+    SHA1=e27c658bf8a7579b662a1c34815daa223e57bc90
-    curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
+
+RUN apk --update --no-cache add bash curl && \
+    curl -sSL --cacert /opt/factorio.crt \
+        https://www.factorio.com/get-download/$VERSION/headless/linux64 \
         -o /tmp/factorio_headless_x64_$VERSION.tar.gz && \
     echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c && \
     tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz --directory /opt && \
     rm /tmp/factorio_headless_x64_$VERSION.tar.gz && \
-    apk del curl && \
+    apk --no-cache del curl && \
     ln -s /factorio/saves /opt/factorio/saves && \
-    ln -s /factorio/mods /opt/factorio/mods
+    ln -s /factorio/mods /opt/factorio/mods && \
+    ln -s /factorio/config/server-settings.json /opt/factorio/data/server-settings.json && \
+    ln -s /factorio/config/map-gen-settings.json /opt/factorio/data/map-gen-settings.json
 
 VOLUME /factorio
 
@@ -22,5 +26,4 @@ EXPOSE 34197/udp 27015/tcp
 
 COPY ./docker-entrypoint.sh /
 
-ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["/docker-entrypoint.sh"]

0.14/build.sh

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

0.14/clean.sh

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

0.14/docker-entrypoint.sh

@@ -1,35 +1,28 @@
-#!/bin/sh -x
+#!/bin/bash -x
 
 set -e
 
-SAVES=/factorio/saves
+SAVES=/opt/factorio/saves
-CONFIG=/factorio/config
 
-mkdir -p $SAVES
+mkdir -p /factorio/saves
 mkdir -p /factorio/mods
-mkdir -p $CONFIG
+mkdir -p /factorio/config
 
-if [ ! -f $CONFIG/rconpw ]; then
+if [ ! -f /factorio/config/server-settings.json ]; then
-  echo $(pwgen 15 1) > $CONFIG/rconpw
+  cp /opt/factorio/data/server-settings.example.json /factorio/config/server-settings.json
 fi
 
-if [ ! -f $CONFIG/server-settings.json ]; then
+if [ ! -f /factorio/config/map-gen-settings.json ]; then
-  cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
+  cp /opt/factorio/data/map-gen-settings.example.json /factorio/config/map-gen-settings.json
-fi
-
-if [ ! -f $CONFIG/map-gen-settings.json ]; then
-  cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
 fi
 
 if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
   /opt/factorio/bin/x64/factorio \
-    --create $SAVES/_autosave1.zip  \
+    --create $SAVES/save.zip \
-    --map-gen-settings $CONFIG/map-gen-settings.json
+    --map-gen-settings /opt/factorio/data/map-gen-settings.json
 fi
 
 exec /opt/factorio/bin/x64/factorio \
   --port 34197 \
   --start-server-load-latest \
-  --server-settings $CONFIG/server-settings.json \
+  --server-settings /opt/factorio/data/server-settings.json
-  --rcon-port 27015 \
-  --rcon-password "$(cat $CONFIG/rconpw)"

0.14/run.sh

@@ -1,5 +1,9 @@
+#mkdir -p /tmp/factorio/config
+#mkdir -p /tmp/factorio/mods
+#mkdir -p /tmp/factorio/saves
+#cp -n server-settings.example.json /tmp/factorio/config/server-settings.json
+#cp -n map-gen-settings.example.json /tmp/factorio/config/map-gen-settings.json
 sudo docker run --rm -it \
 	-v /tmp/factorio:/factorio \
 	--name factorio \
 	factorio "$@"
-find /tmp/factorio -type f

0.15/Dockerfile

@@ -1,30 +0,0 @@
-FROM frolvlad/alpine-glibc:alpine-3.6
-
-MAINTAINER https://github.com/dtandersen/docker_factorio_server
-
-ENV PORT=34197 \
-    RCON_PORT=27015 \
-    VERSION=0.15.40 \
-    SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec
-
-RUN mkdir /opt && \
-    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 && \
-    chmod -R ugo=rwx /opt/factorio && \
-    rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
-    ln -s /factorio/saves /opt/factorio/saves && \
-    ln -s /factorio/mods /opt/factorio/mods && \
-    apk del .build-deps
-
-VOLUME /factorio
-
-EXPOSE $PORT/udp $RCON_PORT/tcp
-
-COPY ./docker-entrypoint.sh /
-
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["/docker-entrypoint.sh"]

0.15/docker-compose.yml

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

0.15/docker-entrypoint.sh

@@ -1,43 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-SAVES=/factorio/saves
-CONFIG=/factorio/config
-
-mkdir -p $SAVES
-mkdir -p /factorio/mods
-mkdir -p $CONFIG
-
-if [ ! -f $CONFIG/rconpw ]; then
-  echo $(pwgen 15 1) > $CONFIG/rconpw
-fi
-
-if [ ! -f $CONFIG/server-settings.json ]; then
-  cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
-fi
-
-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-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 $RCON_PORT \
-  --rcon-password "$(cat $CONFIG/rconpw)" \
-  --server-id /factorio/config/server-id.json

0.16/Dockerfile

@@ -1,49 +0,0 @@
-FROM frolvlad/alpine-glibc:alpine-3.6
-
-MAINTAINER https://github.com/dtandersen/docker_factorio_server
-
-ARG USER=factorio
-ARG GROUP=factorio
-ARG PUID=845
-ARG PGID=845
-
-ENV PORT=34197 \
-    RCON_PORT=27015 \
-    VERSION=0.16.1 \
-    SHA1=1247cdb57b8146896f1972c60911fe45119c384b
-
-VOLUME /factorio
-
-RUN mkdir -p /opt && \
-    apk add --update --no-cache 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 && \
-    chmod -R ugo=rwx /opt/factorio && \
-    rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
-    ln -s /factorio/saves /opt/factorio/saves && \
-    ln -s /factorio/mods /opt/factorio/mods && \
-    apk del .build-deps && \
-    addgroup -g $PGID -S $GROUP && \
-    adduser -u $PUID -G $USER -s /bin/sh -SDH $GROUP && \
-    chown -R $USER:$GROUP /opt/factorio /factorio
-
-EXPOSE $PORT/udp $RCON_PORT/tcp
-
-COPY ./docker-entrypoint.sh /
-
-USER $USER
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/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 $RCON_PORT", \
-    "--rcon-password", "$(cat $CONFIG/rconpw)", \
-    "--server-id /factorio/config/server-id.json" \
-    ]

0.16/docker-compose.yml

@@ -1,9 +0,0 @@
-version: '2'
-services:
-  factorio:
-    build: .
-    ports:
-     - "34197:34197"
-    volumes:
-     - /opt/factorio:/factorio
-    user: 1000:1000

0.16/docker-entrypoint.sh

@@ -1,48 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-id
-
-SAVES=/factorio/saves
-CONFIG=/factorio/config
-
-mkdir -p $SAVES
-mkdir -p /factorio/mods
-mkdir -p $CONFIG
-
-#chown -R factorio /factorio
-
-if [ ! -f $CONFIG/rconpw ]; then
-  echo $(pwgen 15 1) > $CONFIG/rconpw
-fi
-
-if [ ! -f $CONFIG/server-settings.json ]; then
-  cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
-fi
-
-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-settings $CONFIG/map-settings.json
-fi
-
-#exec "$@"
-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 $RCON_PORT \
-  --rcon-password "$(cat $CONFIG/rconpw)" \
-  --server-id /factorio/config/server-id.json

README.md

@@ -1,17 +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/)
+# 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/)
 
-* `0.16.1`, `0.16`, `latest` [(0.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.16/Dockerfile)
+* `0.14.16`, `0.14`, `latest` [(0.14.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/0.14.16/Dockerfile)
-* `0.15.40`, `0.15`, `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 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?
@@ -32,19 +21,14 @@ NOTE: This is only the server. The game is available at [factorio.com](https://w
 Run the server to create the necessary folder structure and configuration files. For this example data is stored in `/tmp/factorio`.
 
 ```
-docker run -d -p 34197:34197/udp -p 27015:27015/tcp \
+docker run -d -P -v /tmp/factorio:/factorio --name factorio dtandersen/factorio
-  -v /tmp/factorio:/factorio \
-  --name factorio \
-  --restart=always  \
-  dtandersen/factorio
 ```
 
 For those new to Docker, here is an explanation of the options:
 
 * `-d` - Run as a daemon ("detached").
-* `-p` - Expose ports.
+* `-P` - Expose all ports.
 * `-v` - Mount `/tmp/factorio` on the local file system to `/factorio` in the container.
-* `--restart` - Restart the server if it crashes and at system start
 * `--name` - Name the container "factorio" (otherwise it has a funny random name).
 
 Check the logs to see what happened:
@@ -68,36 +52,11 @@ 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` and `map-settings.json` files in `/tmp/factorio/config` are used for the map settings. On subsequent runs the newest save is used.
+A new map named `save.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.
 
-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.
+To load an old save stop the server and run the command `touch oldsave.zip`. This resets the date. Then restart the server.
 
 To generate a new map stop the server, delete all of the saves and restart the server.
 
@@ -107,29 +66,16 @@ To generate a new map stop the server, delete all of the saves and restart the s
 Copy mods into the mods folder and restart the server.
 
 
-## RCON
+## Remote Console
 
-Set the RCON password in the `rconpw` file. A random password is generated if `rconpw` doesn't exist.
+RCON is currently disabled.
 
-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 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).
+The philosophy is to keep things simple.
 
-* The server should bootstrap itself.
+* Self-configure to a minimal working state.
 * Prefer configuration files over environment variables.
 * Use one volume for data.
 
@@ -140,46 +86,31 @@ To keep things simple, the container uses a single volume mounted at `/factorio`
 
     factorio
     |-- config
-    |   |-- map-gen-settings.json
-    |   |-- rconpw
     |   |-- server-settings.json
-    |   `-- server-whitelist.json
+    |   +-- map-gen-settings.json
     |-- mods
-    |   `-- fancymod.zip
+    |   |-- fancymod.zip
-    `-- saves
+    +-- saves
-        `-- _autosave1.zip
+        |-- _autosave1.zip
+        +-- save.zip
 
 
 ## Ports
 
-* `34197/udp` - Game server (required).
+* `34197/udp` - Factorio clients (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**
+**Server is listed in the in-game server browser, but users can't connect**
 
-Check the logs. If there is the line `Own address is RIGHT IP:WRONG PORT`, then this could be caused by the Docker proxy. If the the IP and port is correct it's probably a port forwarding or firewall issue instead.
+Run Docker with the `--userland-proxy=false` option. The source UDP port is changed by docker-proxy when the server pings "pingpong" servers. See [Incorrect port detected for docker hosted server](https://forums.factorio.com/viewtopic.php?f=49&t=35255).
-
-By default, Docker routes traffic through a proxy. The proxy changes the source UDP port, so the wrong port is detected. See the forum post *[Incorrect port detected for docker hosted server](https://forums.factorio.com/viewtopic.php?f=49&t=35255)* for details.
-
-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**
-
-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.
 
 
-# Contributors
+# Credits
 
-* [dtandersen](https://github.com/dtandersen/docker_factorio_server) - Maintainer
+Ideas borrowed from:
-* [Zopanix](https://github.com/zopanix/docker_factorio_server) - Originator
+
-* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio) - Randomly generate RCON password
+* [Zopanix](https://github.com/zopanix/docker_factorio_server)
-* [gnomus](https://github.com/gnomus/docker_factorio_server) - White listing
+* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio)
-* [jaredledvina](https://github.com/jaredledvina/docker_factorio_server) - Version update