Merge pull request #98 from dtandersen/update-0.16.7

Updated to version 0.16.7

0.16/Dockerfile

@@ -1,5 +1,4 @@
 FROM frolvlad/alpine-glibc:alpine-3.6
-#FROM ubuntu:18.04
 
 MAINTAINER https://github.com/dtandersen/docker_factorio_server
 
@@ -10,23 +9,19 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.16.0 \
-    SHA1=b4d8d6db02aff914b823d5f525c0f0f2acd9c355
-#    VERSION=0.15.40 \
-#    SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec
+    VERSION=0.16.7 \
+    SHA1=7bd14a4d8abe2feef015d1b3d75c6ec82a5e2ccf
 
 VOLUME /factorio
 
 RUN mkdir -p /opt && \
-#    apt-get update && \
-#    apt-get install -y curl xz-utils
-    apk add --update --no-cache tini pwgen && \
+    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 && \
+    chmod 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 && \
@@ -39,18 +34,6 @@ EXPOSE $PORT/udp $RCON_PORT/tcp
 
 COPY ./docker-entrypoint.sh /
 
-#USER $USER
+USER $USER
 
-#ENTRYPOINT ["/sbin/tini", "--"]
-#CMD ["/docker-entrypoint.sh"]
 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

@@ -6,4 +6,3 @@ services:
      - "34197:34197"
     volumes:
      - /opt/factorio:/factorio
-    user: 1001:1001

0.16/docker-entrypoint.sh

@@ -36,7 +36,6 @@ if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
     --map-settings $CONFIG/map-settings.json
 fi
 
-#exec "$@"
 exec /opt/factorio/bin/x64/factorio \
   --port $PORT \
   --start-server-load-latest \

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.15.40`, `0.15`, `latest` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
-* `0.15.37`, `stable` [(0.15/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.15/Dockerfile)
+* `0.16.7`, `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.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)