Merge pull request #189 from DBendit/fix-mapgen

Mapgen example fixed in 0.17.2

0.17/Dockerfile

@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.17.1 \
-    SHA1=cab0b48a5ddb1870bab2c07cc6ad5726097c1fc5 \
+    VERSION=0.17.2 \
+    SHA1=0f0931e3444befcd5e37abe912551f75f681c4ca \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \
@@ -34,6 +34,10 @@ RUN mkdir -p /opt /factorio && \
     addgroup -g $PGID -S $GROUP && \
     adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER && \
     chown -R $USER:$GROUP /opt/factorio /factorio
+#    mkdir -p /opt/factorio/temp && \
+#    chmod 777 -R /opt/factorio/temp && \
+#    mkdir -p /opt/factorio/temp && \
+#    chmod 777 -R /opt/factorio/temp && \
 
 VOLUME /factorio
 

0.17/docker-compose.yml

@@ -7,3 +7,5 @@ services:
      - "27015:27015/tcp"
     volumes:
      - /opt/factorio:/factorio
+#    user: 845:845
+#    user: 1000:1000

0.17/files/docker-entrypoint.sh

@@ -2,7 +2,7 @@
 set -e
 
 id
-#
+
 FACTORIO_VOL=/factorio
 mkdir -p $FACTORIO_VOL
 mkdir -p $SAVES
@@ -12,15 +12,17 @@ mkdir -p $SCENARIOS
 mkdir -p $SCRIPTOUTPUT
 
 if [ ! -f $CONFIG/rconpw ]; then
+  # Generate a new RCON password if none exists
   echo $(pwgen 15 1) > $CONFIG/rconpw
 fi
 
 if [ ! -f $CONFIG/server-settings.json ]; then
+  # Copy default settings if server-settings.json doesn't exist
   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
+  cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
   echo "{}" > $CONFIG/map-gen-settings.json
 fi
 
@@ -29,10 +31,12 @@ if [ ! -f $CONFIG/map-settings.json ]; then
 fi
 
 if find -L $SAVES -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then
+  # Delete incomplete saves (such as after a forced exit)
   rm -f $SAVES/*.tmp.zip
 fi
 
 if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
+  # Generate a new map if no save ZIPs exist
   /opt/factorio/bin/x64/factorio \
     --create $SAVES/_autosave1.zip  \
     --map-gen-settings $CONFIG/map-gen-settings.json \
@@ -40,10 +44,16 @@ if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
 fi
 
 if [ "$(id -u)" = '0' ]; then
+  # Take ownership of factorio data if running as root
   chown -R factorio:factorio $FACTORIO_VOL
+  # Make sure we own temp
+  mkdir -p /opt/factorio/temp
+  chown -R factorio:factorio /opt/factorio/temp
+  # Drop to the factorio user
+  SU_EXEC="su-exec factorio"
 fi
 
-exec su-exec factorio /opt/factorio/bin/x64/factorio \
+exec ${SU_EXEC} /opt/factorio/bin/x64/factorio \
   --port $PORT \
   --start-server-load-latest \
   --server-settings $CONFIG/server-settings.json \
@@ -51,6 +61,8 @@ exec su-exec factorio /opt/factorio/bin/x64/factorio \
   --rcon-port $RCON_PORT \
   --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.1`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/master/0.17/Dockerfile)
+* `0.17.2`, `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)
@@ -8,9 +8,9 @@
 
 *Tag descriptions*
 
-* `latest` - the most up-to-date version (may be experimental).
-* `stable` - the version declared stable on [factorio.com](https://www.factorio.com).
-* `0.x` - highest version in a branch: may be experimental.
+* `latest` - most up-to-date version (may be experimental).
+* `stable` - version declared stable on [factorio.com](https://www.factorio.com).
+* `0.x` - latest version in a branch.
 * `0.x.y` - a specific version.
 * `0.x-dev` - whatever is in master for that version.
 
@@ -164,6 +164,24 @@ Create file `config/server-whitelist.json` and add the whitelisted users.
 		"friend"
 	]
 
+## Banlisting (0.17.1+)
+
+Create file `config/server-banlist.json` and add the banlisted users.
+
+    [
+        "bad_person",
+        "other_bad_person"
+    ]
+
+## Adminlisting (0.17.1+)
+
+Create file `config/server-adminlist.json` and add the adminlisted users.
+
+    [
+        "you",
+        "friend"
+    ]
+
 # Container Details
 
 The philosophy is to [keep it simple](http://wiki.c2.com/?KeepItSimple).
@@ -182,7 +200,9 @@ To keep things simple, the container uses a single volume mounted at `/factorio`
     |   |-- map-gen-settings.json
     |   |-- rconpw
     |   |-- server-settings.json
-    |   `-- server-whitelist.json
+    |   |-- server-whitelist.json
+    |   |-- server-banlist.json
+    |   `-- server-adminlist.json
     |-- mods
     |   `-- fancymod.zip
     `-- saves