update to 0.16.30 (#140)

Scenario tweaks

0.13/Dockerfile

@@ -0,0 +1,28 @@
+FROM frolvlad/alpine-glibc:alpine-3.4
+
+MAINTAINER https://github.com/dtandersen/docker_factorio_server
+
+COPY ./factorio.crt /opt/factorio.crt
+
+ENV VERSION=0.13.20 \
+    SHA1=59ed0edb3f62f0f41a01fc291959b0a8b44cf631
+
+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 del curl && \
+    ln -s /factorio/saves /opt/factorio/saves && \
+    ln -s /factorio/mods /opt/factorio/mods
+
+VOLUME /factorio
+
+EXPOSE 34197/udp 27015/tcp
+
+COPY ./docker-entrypoint.sh /
+
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["/docker-entrypoint.sh"]

0.13/build.sh

@@ -0,0 +1 @@
+sudo docker build -t dtandersen/factorio:0.13-dev .

0.13/clean.sh

@@ -0,0 +1 @@
+sudo rm -rf /tmp/factorio

0.13/docker-entrypoint.sh

@@ -0,0 +1,35 @@
+#!/bin/sh -x
+
+set -e
+
+SAVES=/factorio/saves
+CONFIG=/factorio/config
+
+mkdir -p $SAVES
+mkdir -p /factorio/mods
+mkdir -p $CONFIG
+
+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 ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
+  /opt/factorio/bin/x64/factorio \
+    --create $SAVES/_autosave1.zip  \
+    --map-gen-settings $CONFIG/map-gen-settings.json
+fi
+
+exec /opt/factorio/bin/x64/factorio \
+  --port 34197 \
+  --start-server-load-latest \
+  --server-settings $CONFIG/server-settings.json \
+  --rcon-port 27015 \
+  --rcon-password "$(cat $CONFIG/rconpw)"

0.13/factorio.crt

@@ -0,0 +1,92 @@
+-----BEGIN CERTIFICATE-----
+MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB
+hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
+BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTQwMjEy
+MDAwMDAwWhcNMjkwMjExMjM1OTU5WjCBkDELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
+EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxNjA0BgNVBAMTLUNPTU9ETyBSU0EgRG9tYWluIFZh
+bGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAI7CAhnhoFmk6zg1jSz9AdDTScBkxwtiBUUWOqigwAwCfx3M28Sh
+bXcDow+G+eMGnD4LgYqbSRutA776S9uMIO3Vzl5ljj4Nr0zCsLdFXlIvNN5IJGS0
+Qa4Al/e+Z96e0HqnU4A7fK31llVvl0cKfIWLIpeNs4TgllfQcBhglo/uLQeTnaG6
+ytHNe+nEKpooIZFNb5JPJaXyejXdJtxGpdCsWTWM/06RQ1A/WZMebFEh7lgUq/51
+UHg+TLAchhP6a5i84DuUHoVS3AOTJBhuyydRReZw3iVDpA3hSqXttn7IzW3uLh0n
+c13cRTCAquOyQQuvvUSH2rnlG51/ruWFgqUCAwEAAaOCAWUwggFhMB8GA1UdIwQY
+MBaAFLuvfgI9+qbxPISOre44mOzZMjLUMB0GA1UdDgQWBBSQr2o6lFoL2JDqElZz
+30O0Oija5zAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGwYDVR0gBBQwEjAGBgRVHSAAMAgG
+BmeBDAECATBMBgNVHR8ERTBDMEGgP6A9hjtodHRwOi8vY3JsLmNvbW9kb2NhLmNv
+bS9DT01PRE9SU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDBxBggrBgEFBQcB
+AQRlMGMwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9E
+T1JTQUFkZFRydXN0Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21v
+ZG9jYS5jb20wDQYJKoZIhvcNAQEMBQADggIBAE4rdk+SHGI2ibp3wScF9BzWRJ2p
+mj6q1WZmAT7qSeaiNbz69t2Vjpk1mA42GHWx3d1Qcnyu3HeIzg/3kCDKo2cuH1Z/
+e+FE6kKVxF0NAVBGFfKBiVlsit2M8RKhjTpCipj4SzR7JzsItG8kO3KdY3RYPBps
+P0/HEZrIqPW1N+8QRcZs2eBelSaz662jue5/DJpmNXMyYE7l3YphLG5SEXdoltMY
+dVEVABt0iN3hxzgEQyjpFv3ZBdRdRydg1vs4O2xyopT4Qhrf7W8GjEXCBgCq5Ojc
+2bXhc3js9iPc0d1sjhqPpepUfJa3w/5Vjo1JXvxku88+vZbrac2/4EjxYoIQ5QxG
+V/Iz2tDIY+3GH5QFlkoakdH368+PUq4NCNk+qKBR6cGHdNXJ93SrLlP7u3r7l+L4
+HyaPs9Kg4DdbKDsx5Q5XLVq4rXmsXiBmGqW5prU5wfWYQ//u+aen/e7KJD2AFsQX
+j4rBYKEMrltDR5FL1ZoXX/nUh8HCjLfn4g8wGTeGrODcQgPmlKidrv0PJFGUzpII
+0fxQ8ANAe4hZ7Q7drNJ3gjTcBpUC2JD5Leo31Rpg0Gcg19hCC0Wvgmje3WYkN5Ap
+lBlGGSW4gNfL1IYoakRwJiNiqZ+Gb7+6kHDSVneFeO/qJakXzlByjAA6quPbYzSf
++AZxAeKCINT+b72x
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
+ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
+eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow
+gYUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSswKQYD
+VQQDEyJDT01PRE8gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkehUktIKVrGsDSTdxc9EZ3SZKzejfSNw
+AHG8U9/E+ioSj0t/EFa9n3Byt2F/yUsPF6c947AEYe7/EZfH9IY+Cvo+XPmT5jR6
+2RRr55yzhaCCenavcZDX7P0N+pxs+t+wgvQUfvm+xKYvT3+Zf7X8Z0NyvQwA1onr
+ayzT7Y+YHBSrfuXjbvzYqOSSJNpDa2K4Vf3qwbxstovzDo2a5JtsaZn4eEgwRdWt
+4Q08RWD8MpZRJ7xnw8outmvqRsfHIKCxH2XeSAi6pE6p8oNGN4Tr6MyBSENnTnIq
+m1y9TBsoilwie7SrmNnu4FGDwwlGTm0+mfqVF9p8M1dBPI1R7Qu2XK8sYxrfV8g/
+vOldxJuvRZnio1oktLqpVj3Pb6r/SVi+8Kj/9Lit6Tf7urj0Czr56ENCHonYhMsT
+8dm74YlguIwoVqwUHZwK53Hrzw7dPamWoUi9PPevtQ0iTMARgexWO/bTouJbt7IE
+IlKVgJNp6I5MZfGRAy1wdALqi2cVKWlSArvX31BqVUa/oKMoYX9w0MOiqiwhqkfO
+KJwGRXa/ghgntNWutMtQ5mv0TIZxMOmm3xaG4Nj/QN370EKIf6MzOi5cHkERgWPO
+GHFrK+ymircxXDpqR+DDeVnWIBqv8mqYqnK8V0rSS527EPywTEHl7R09XiidnMy/
+s1Hap0flhFMCAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTvA73g
+JMtUGjAdBgNVHQ4EFgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQD
+AgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1UdHwQ9
+MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4dGVy
+bmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
+Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAGS/g/FfmoXQ
+zbihKVcN6Fr30ek+8nYEbvFScLsePP9NDXRqzIGCJdPDoCpdTPW6i6FtxFQJdcfj
+Jw5dhHk3QBN39bSsHNA7qxcS1u80GH4r6XnTq1dFDK8o+tDb5VCViLvfhVdpfZLY
+Uspzgb8c8+a4bmYRBbMelC1/kZWSWfFMzqORcUx8Rww7Cxn2obFshj5cqsQugsv5
+B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx
+PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR
+pu/xO28QOG8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----

0.13/run.sh

@@ -0,0 +1,5 @@
+sudo docker run --rm -it \
+	-v /tmp/factorio:/factorio \
+	--name factorio \
+	dtandersen/factorio:0.13-dev "$@"
+find /tmp/factorio -type f

0.14/Dockerfile

@@ -0,0 +1,26 @@
+FROM frolvlad/alpine-glibc:alpine-3.4
+
+MAINTAINER https://github.com/dtandersen/docker_factorio_server
+
+ENV VERSION=0.14.23 \
+    SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a
+
+RUN mkdir /opt && \
+    apk --no-cache add curl tini pwgen && \
+    curl -sSL 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 del curl && \
+    ln -s /factorio/saves /opt/factorio/saves && \
+    ln -s /factorio/mods /opt/factorio/mods
+
+VOLUME /factorio
+
+EXPOSE 34197/udp 27015/tcp
+
+COPY ./docker-entrypoint.sh /
+
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["/docker-entrypoint.sh"]

0.14/build.sh

@@ -0,0 +1 @@
+sudo docker build --no-cache -t factorio .

0.14/clean.sh

@@ -0,0 +1 @@
+sudo rm -rf /tmp/factorio

0.14/docker-entrypoint.sh

@@ -0,0 +1,35 @@
+#!/bin/sh -x
+
+set -e
+
+SAVES=/factorio/saves
+CONFIG=/factorio/config
+
+mkdir -p $SAVES
+mkdir -p /factorio/mods
+mkdir -p $CONFIG
+
+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 ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
+  /opt/factorio/bin/x64/factorio \
+    --create $SAVES/_autosave1.zip  \
+    --map-gen-settings $CONFIG/map-gen-settings.json
+fi
+
+exec /opt/factorio/bin/x64/factorio \
+  --port 34197 \
+  --start-server-load-latest \
+  --server-settings $CONFIG/server-settings.json \
+  --rcon-port 27015 \
+  --rcon-password "$(cat $CONFIG/rconpw)"

0.14/run.sh

@@ -0,0 +1,5 @@
+sudo docker run --rm -it \
+	-v /tmp/factorio:/factorio \
+	--name factorio \
+	factorio "$@"
+find /tmp/factorio -type f

0.15/Dockerfile

@@ -0,0 +1,30 @@
+FROM frolvlad/alpine-glibc:alpine-3.6
+
+MAINTAINER https://github.com/dtandersen/docker_factorio_server
+
+ENV PORT=34197 \
+    RCON_PORT=27015 \
+    VERSION=0.15.40 \
+    SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec
+
+RUN mkdir /opt && \
+    apk add --update --no-cache tini 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 && \
+    rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
+    ln -s /factorio/saves /opt/factorio/saves && \
+    ln -s /factorio/mods /opt/factorio/mods && \
+    apk del .build-deps
+
+VOLUME /factorio
+
+EXPOSE $PORT/udp $RCON_PORT/tcp
+
+COPY ./docker-entrypoint.sh /
+
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["/docker-entrypoint.sh"]

0.15/docker-compose.yml

@@ -0,0 +1,8 @@
+version: '2'
+services:
+  factorio:
+    build: .
+    ports:
+     - "34197:34197"
+    volumes:
+     - /tmp/factorio:/factorio

0.15/docker-entrypoint.sh

@@ -0,0 +1,43 @@
+#!/bin/sh -x
+
+set -e
+
+SAVES=/factorio/saves
+CONFIG=/factorio/config
+
+mkdir -p $SAVES
+mkdir -p /factorio/mods
+mkdir -p $CONFIG
+
+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
+
+if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
+  /opt/factorio/bin/x64/factorio \
+    --create $SAVES/_autosave1.zip  \
+    --map-gen-settings $CONFIG/map-gen-settings.json \
+    --map-settings $CONFIG/map-settings.json
+fi
+
+exec /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/Dockerfile

@@ -0,0 +1,51 @@
+FROM frolvlad/alpine-glibc:alpine-3.7
+
+MAINTAINER https://github.com/dtandersen/docker_factorio_server
+
+ARG USER=factorio
+ARG GROUP=factorio
+ARG PUID=845
+ARG PGID=845
+
+ENV PORT=34197 \
+    RCON_PORT=27015 \
+    VERSION=0.16.30 \
+    SHA1=7ceac7d3cfee2c301707e2622400d2c7bc6f2e8c \
+    SAVES=/factorio/saves \
+    CONFIG=/factorio/config \
+    MODS=/factorio/mods \
+    SCENARIOS=/factorio/scenarios \
+    ENTRYPOINTS=/factorio/entrypoints
+
+RUN mkdir -p /opt /factorio && \
+    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 ugo=rwx /opt/factorio && \
+    rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
+    ln -s -f $SAVES /opt/factorio/saves && \
+    ln -s -f $MODS /opt/factorio/mods && \
+    ln -s -f $SCENARIOS /opt/factorio/scenarios && \
+    ln -s -f $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
+
+#symbolic link the default entrypoint to the entrypoints directory so it can be inspected and copied to new entrypoints
+#RUN ln -s -f /docker-entrypoint.sh $ENTRYPOINTS/docker-entrypoint.sh
+
+USER $USER
+
+ENTRYPOINT ["/docker-entrypoint.sh"]

0.16/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '2'
+services:
+  factorio:
+    build: .
+    ports:
+     - "34197:34197/udp"
+     - "27015:27015/tcp"
+    volumes:
+     - /opt/factorio:/factorio

0.16/docker-entrypoint.sh

@@ -0,0 +1,46 @@
+#!/bin/sh -x
+
+set -e
+
+id
+
+mkdir -p $SAVES
+mkdir -p $CONFIG
+mkdir -p $MODS
+mkdir -p $SCENARIOS
+mkdir -p $ENTRYPOINTS
+
+#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
+
+if ! find -L $SAVES -iname \*.zip -mindepth 1 -print | grep -q .; then
+  /opt/factorio/bin/x64/factorio \
+    --create $SAVES/_autosave1.zip  \
+    --map-gen-settings $CONFIG/map-gen-settings.json \
+    --map-settings $CONFIG/map-settings.json
+fi
+
+exec /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/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

README.md

@@ -1,2 +1,296 @@
-# docker_factorio_server
+# 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/)
-Factorio Server in Docker
+
+* `0.16.30`, `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)
+
+*Tag descriptions*
+
+* `latest` - highest version: may be experimental.
+* `stable` - highest version declared stable.
+* `0.x` - highest version in a branch: may be experimental.
+* `0.x.y` - a specific version.
+* `0.x-dev` - whatever is in master for that version.
+
+
+# What is Factorio?
+
+[Factorio](https://www.factorio.com) is a game in which you build and maintain factories.
+
+You will be mining resources, researching technologies, building infrastructure, automating production and fighting enemies. Use your imagination to design your factory, combine simple elements into ingenious structures, apply management skills to keep it working and finally protect it from the creatures who don't really like you.
+
+The game is very stable and optimized for building massive factories. You can create your own maps, write mods in Lua or play with friends via Multiplayer.
+
+NOTE: This is only the server. The game is available at [factorio.com](https://www.factorio.com) and [Steam](http://store.steampowered.com/app/427520/).
+
+
+# Usage
+
+## Quick Start
+
+Run the server to create the necessary folder structure and configuration files. For this example data is stored in `/opt/factorio`.
+
+```
+sudo mkdir -p /opt/factorio
+sudo chown 845:845 /opt/factorio
+sudo docker run -d \
+  -p 34197:34197/udp \
+  -p 27015:27015/tcp \
+  -v /opt/factorio:/factorio \
+  --name factorio \
+  --restart=always  \
+  dtandersen/factorio
+```
+
+For those new to Docker, here is an explanation of the options:
+
+* `-d` - Run as a daemon ("detached").
+* `-p` - Expose ports.
+* `-v` - Mount `/opt/factorio` on the local file system to `/factorio` in the container.
+* `--restart` - Restart the server if it crashes and at system start
+* `--name` - Name the container "factorio" (otherwise it has a funny random name).
+
+The `chown` command is needed because in 0.16+, we no longer run the game server as root for security reasons, but rather as a 'factorio' user with user id 845. The host must therefore allow these files to be written by that user.
+
+Check the logs to see what happened:
+
+```
+docker logs factorio
+```
+
+Stop the server:
+
+```
+docker stop factorio
+```
+
+Now there's a `server-settings.json` file in the folder `/opt/factorio/config`. Modify this to your liking and restart the server:
+
+```
+docker start factorio
+```
+
+Try to connect to the server. Check the logs if it isn't working.
+
+
+## Console
+
+To issue console commands to the server, start the server in interactive mode with `-it`. Open the console with `docker attach` and then type commands.
+
+	docker run -d -it  \
+        --name factorio \
+        dtandersen/factorio
+	docker attach factorio
+
+
+## Upgrading
+
+Before upgrading backup the save. It's easy to make a save in the client.
+
+Ensure `-v` was used to run the server so the save is outside of the Docker container. The `docker rm` command completely destroys the container, which includes the save if it isn't stored in an data volume.
+
+Delete the container and refresh the image:
+
+	docker stop factorio
+	docker rm factorio
+	docker pull dtandersen/factorio
+
+Now run the server as before. In about a minute the new version of Factorio should be up and running, complete with saves and config!
+
+
+## Saves
+
+A new map named `_autosave1.zip` is generated the first time the server is started. The `map-gen-settings.json` and `map-settings.json` files in `/opt/factorio/config` are used for the map settings. On subsequent runs the newest save is used.
+
+To load an old save stop the server and run the command `touch oldsave.zip`. This resets the date. Then restart the server. Another option is to delete all saves except one.
+
+To generate a new map stop the server, delete all of the saves and restart the server.
+
+
+## Mods
+
+Copy mods into the mods folder and restart the server.
+
+
+## Scenarios
+
+If you want to launch a scenario from a clean start (not from a saved map) you'll need to start the docker image from an alternate entrypoint. To do this, use the example entrypoint file stored in the /factorio/entrypoints directory in the volume, and launch the image with the following syntax. Note that this is the normal syntax with the addition of the --entrypoint setting AND the additional argument at the end, which is the name of the Scenario in the Scenarios folder.
+
+```
+docker run -d \
+  -p 34197:34197/udp \
+  -p 27015:27015/tcp \
+  -v /opt/factorio:/factorio \
+  --name factorio \
+  --restart=always  \
+  --entrypoint "/factorio/entrypoints/scenario.sh" \
+  dtandersen/factorio \
+  MyScenarioName
+```
+
+## Converting Scenarios to Regular Maps
+
+If you would like to export your scenario to a saved map, you can use the example entrypoint similar to the Scenario usag above. Factorio will run once, converting the Scenario to a saved Map in your saves directory. A restart of the docker image using the standard options will then load that map, just as if the scenario were just started by the Scenarios example noted above. 
+
+```
+docker run -d \
+  -p 34197:34197/udp \
+  -p 27015:27015/tcp \
+  -v /opt/factorio:/factorio \
+  --name factorio \
+  --restart=always  \
+  --entrypoint "/factorio/entrypoints/scenario2map.sh" \
+  dtandersen/factorio
+  MyScenarioName
+```
+
+## RCON
+
+Set the RCON password in the `rconpw` file. A random password is generated if `rconpw` doesn't exist.
+
+To change the password, stop the server, modify `rconpw`, and restart the server.
+
+To "disable" RCON don't expose port 27015, i.e. start the server without `-p 27015:27015/tcp`. RCON is still running, but nobody can to connect to it.
+
+
+## Whitelisting (0.15.3+)
+
+Create file `config/server-whitelist.json` and add the whitelisted users.
+
+    [
+		"you",
+		"friend"
+	]
+
+# Container Details
+
+The philosophy is to [keep it simple](http://wiki.c2.com/?KeepItSimple).
+
+* The server should bootstrap itself.
+* Prefer configuration files over environment variables.
+* Use one volume for data.
+
+
+## Volumes
+
+To keep things simple, the container uses a single volume mounted at `/factorio`. This volume stores configuration, mods, and saves.
+
+    factorio
+    |-- config
+    |   |-- map-gen-settings.json
+    |   |-- rconpw
+    |   |-- server-settings.json
+    |   `-- server-whitelist.json
+    |-- mods
+    |   `-- fancymod.zip
+    `-- saves
+        `-- _autosave1.zip
+
+
+## Docker Compose
+
+[Docker Compose](https://docs.docker.com/compose/install/) is an easy way to run Docker containers.
+
+First get a [docker-compose.yml](https://github.com/dtandersen/docker_factorio_server/blob/master/0.16/docker-compose.yml) file. To get it from this repository:
+
+```
+git clone https://github.com/dtandersen/docker_factorio_server.git
+cd docker_factorio_server/0.16
+```
+
+Or make your own:
+
+```
+version: '2'
+services:
+  factorio:
+    image: dtandersen/factorio
+    ports:
+     - "34197:34197/udp"
+     - "27015:27015/tcp"
+    volumes:
+     - /opt/factorio:/factorio
+```
+
+Now cd to the directory with docker-compose.yml and run:
+
+```
+sudo mkdir -p /opt/factorio
+sudo chown 845:845 /opt/factorio
+sudo docker-compose up -d
+```
+
+
+## Ports
+
+* `34197/udp` - Game server (required).
+* `27015/tcp` - RCON (optional).
+
+
+## Environment Variables
+
+* `PORT` (0.15+) - Start the server on an alterate port, .e.g. `docker run -e "PORT=34198"`.
+* `RCON_PORT` (0.16+) - Start the RCON on an alterate port, .e.g. `docker run -e "RCON_PORT=34198"`.
+
+
+## LAN Games
+
+Ensure the `lan` setting in server-settings.json is `true`.
+
+```
+  "visibility":
+  {
+    "public": false,
+    "lan": true
+  },
+```
+
+Start the container with the `--network=host` option so clients can automatically find LAN games. Refer to the Quick Start to create the `/opt/factorio` directory.
+
+```
+sudo docker run -d \
+  --network=host \
+  -p 34197:34197/udp \
+  -p 27015:27015/tcp \
+  -v /opt/factorio:/factorio \
+  --name factorio \
+  --restart=always  \
+  dtandersen/factorio
+```
+
+VirtualBox users must enable Bridged networking in order for the host to be assigned an internal network IP. Enable Bridged networking in Vagrant with:
+
+```
+  config.vm.network "public_network"
+  config.vm.network "forwarded_port", guest: 34197, host: 34197
+```
+
+## Vagrant
+
+Vagrant is a good way for those without a Linux machine to try Docker. Check out the [Factorio Vagrant Box](https://github.com/dtandersen/factorio-lan-vagrant).
+
+## Troubleshooting
+
+**My server is listed in the server browser, but nobody can connect**
+
+Check the logs. If there is the line `Own address is RIGHT IP:WRONG PORT`, then this could be caused by the Docker proxy. If the the IP and port is correct it's probably a port forwarding or firewall issue instead.
+
+By default, Docker routes traffic through a proxy. The proxy changes the source UDP port, so the wrong port is detected. See the forum post *[Incorrect port detected for docker hosted server](https://forums.factorio.com/viewtopic.php?f=49&t=35255)* for details.
+
+To fix the incorrect port, start the Docker service with the `--userland-proxy=false` switch. Docker will route traffic with iptables rules instead of a proxy. Add the switch to the `DOCKER_OPTS` environment variable or `ExecStart` in the Docker systemd service definition. The specifics vary by operating system.
+
+**When I run a server on a port besides 34197 nobody can connect from the server browser**
+
+Use the `PORT` environment variable to start the server on the a different port, .e.g. `docker run -e "PORT=34198"`. This changes the source port on the packets used for port detection. `-p 34198:34197` works fine for private servers, but the server browser detects the wrong port.
+
+
+# Contributors
+
+* [dtandersen](https://github.com/dtandersen/docker_factorio_server) - Maintainer
+* [Fank](https://github.com/Fankserver/docker-factorio-watchdog) - Keeper of the Factorio watchdog that keeps the version up-to-date.
+* [Zopanix](https://github.com/zopanix/docker_factorio_server) - Originator
+* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio) - Randomly generate RCON password
+* [gnomus](https://github.com/gnomus/docker_factorio_server) - White listing
+* [bplein](https://github.com/bplein/docker_factorio_server) - Scenario support
+* [jaredledvina](https://github.com/jaredledvina/docker_factorio_server) - Version update