Merge pull request #115 from bplein/master

Add Scenarios Folder, Alternate Entrypoints Folder

0.16/Dockerfile

@@ -7,6 +7,8 @@ ARG GROUP=factorio
 ARG PUID=845
 ARG PGID=845
 
+VOLUME /factorio
+
 ENV PORT=34197 \
     RCON_PORT=27015 \
     VERSION=0.16.29 \
@@ -21,18 +23,22 @@ RUN mkdir -p /opt /factorio && \
     tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
     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 && \
+    ln -s -f /factorio/saves /opt/factorio/saves && \
+    ln -s -f /factorio/mods /opt/factorio/mods && \
+    ln -s -f /factorio/scenarios /opt/factorio/scenarios && \
+    ln -s -f /factorio/entrypoints /opt/factorio/entrypoints && \
     apk del .build-deps && \
     addgroup -g $PGID -S $GROUP && \
     adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER && \
     chown -R $USER:$GROUP /opt/factorio /factorio
 
-VOLUME /factorio
+
 
 EXPOSE $PORT/udp $RCON_PORT/tcp
 
 COPY ./docker-entrypoint.sh /
+COPY ./scenario2map.sh /factorio/entrypoints
+COPY ./scenario.sh /factorio/entrypoints
 
 USER $USER
 

0.16/docker-entrypoint.sh

@@ -6,10 +6,18 @@ id
 
 SAVES=/factorio/saves
 CONFIG=/factorio/config
+MODS=/factorio/mods
+SCENARIOS=/factorio/scenarios
+ENTRYPOINTS=/factorio/entrypoints
 
 mkdir -p $SAVES
-mkdir -p /factorio/mods
 mkdir -p $CONFIG
+mkdir -p $MODS
+mkdir -p $SCENARIOS
+mkdir -p $ENTRYPOINTS
+
+#symbolic link the default entrypoint to the entrypoints directory so it can be inspected and copied to new entrypoints
+ln -s -f /docker-entrypoint.sh $ENTRYPOINTS/docker-entrypoint.sh
 
 #chown -R factorio /factorio
 

0.16/scenario.sh

@@ -0,0 +1,49 @@
+#!/bin/sh -x
+if [ -z "$1" ]
+  then
+    echo "No argument supplied"
+fi
+SCENARIO=$1
+
+set -e
+
+id
+
+SAVES=/factorio/saves
+CONFIG=/factorio/config
+MODS=/factorio/mods
+SCENARIOS=/factorio/scenarios
+
+mkdir -p $SAVES
+mkdir -p $CONFIG
+mkdir -p $MODS
+mkdir -p $SCENARIOS
+
+#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
+
+
+exec /opt/factorio/bin/x64/factorio \
+  --port $PORT \
+  --start-server-load-scenario $SCENARIO \
+  --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/scenario2map.sh

@@ -0,0 +1,37 @@
+#!/bin/sh -x
+if [ -z "$1" ]
+  then
+    echo "No argument supplied"
+fi
+SCENARIO=$1
+
+set -e
+
+id
+
+SAVES=/factorio/saves
+CONFIG=/factorio/config
+MODS=/factorio/mods
+SCENARIOS=/factorio/scenarios
+
+mkdir -p $SAVES
+mkdir -p $CONFIG
+mkdir -p $MODS
+mkdir -p $SCENARIOS
+
+#chown -R factorio /factorio
+
+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
+
+exec /opt/factorio/bin/x64/factorio \
+  --scenario2map $SCENARIO