diff --git a/0.14/Dockerfile b/0.14/Dockerfile index fc70aad..c8b955c 100644 --- a/0.14/Dockerfile +++ b/0.14/Dockerfile @@ -7,18 +7,16 @@ COPY ./factorio.crt /opt/factorio.crt ENV VERSION=0.14.17 \ SHA1=ffb248fabed345aafadb6a8cdef3684312ac240f -RUN apk --update --no-cache add bash curl tini pwgen && \ +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 --no-cache del curl && \ + apk del curl && \ ln -s /factorio/saves /opt/factorio/saves && \ - 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 + ln -s /factorio/mods /opt/factorio/mods VOLUME /factorio diff --git a/0.14/docker-entrypoint.sh b/0.14/docker-entrypoint.sh index 03e4b84..4eb8cc0 100755 --- a/0.14/docker-entrypoint.sh +++ b/0.14/docker-entrypoint.sh @@ -1,34 +1,35 @@ -#!/bin/bash -x +#!/bin/sh -x set -e -SAVES=/opt/factorio/saves +SAVES=/factorio/saves +CONFIG=/factorio/config -mkdir -p /factorio/saves +mkdir -p $SAVES mkdir -p /factorio/mods -mkdir -p /factorio/config +mkdir -p $CONFIG -if [ ! -f /factorio/config/rconpw ]; then - echo $(pwgen 15 1) > /factorio/config/rconpw +if [ ! -f $CONFIG/rconpw ]; then + echo $(pwgen 15 1) > $CONFIG/rconpw fi -if [ ! -f /factorio/config/server-settings.json ]; then - cp /opt/factorio/data/server-settings.example.json /factorio/config/server-settings.json +if [ ! -f $CONFIG/server-settings.json ]; then + cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json fi -if [ ! -f /factorio/config/map-gen-settings.json ]; then - cp /opt/factorio/data/map-gen-settings.example.json /factorio/config/map-gen-settings.json +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 /opt/factorio/data/map-gen-settings.json + --map-gen-settings $CONFIG/map-gen-settings.json fi exec /opt/factorio/bin/x64/factorio \ --port 34197 \ --start-server-load-latest \ - --server-settings /opt/factorio/data/server-settings.json \ + --server-settings $CONFIG/server-settings.json \ --rcon-port 27015 \ - --rcon-password "$(cat /factorio/config/rconpw)" + --rcon-password "$(cat $CONFIG/rconpw)"