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/files/docker-entrypoint.sh

@@ -22,8 +22,7 @@ if [ ! -f $CONFIG/server-settings.json ]; then
 fi
 
 if [ ! -f $CONFIG/map-gen-settings.json ]; then
-  # TODO: Need a valid map-gen-settings.json
-  # 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
 
@@ -47,7 +46,10 @@ fi
 if [ "$(id -u)" = '0' ]; then
   # Take ownership of factorio data if running as root
   chown -R factorio:factorio $FACTORIO_VOL
-  # We want to drop to the factorio user
+  # 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
 

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)