proxy details

added 0.14 version

.hadolint.yaml

@@ -1,14 +0,0 @@
-ignored:
-  # ignore apt version pinning
-  - DL3008
-  # ignore pip version pinning
-  - DL3013
-  # ignore apk version pinning
-  - DL3018
-  # ignore pipefail cause Balena/resin.io images do not work with it
-  - DL4006
-  # ignore false positive regex
-  - SC1083 
-  - SC2086 
-  # ignore as need for debug
-  - SC2005

.travis.yml

@@ -1,27 +0,0 @@
-dist: xenial
-sudo: required
-language: bash
-services: 
-  - docker
-addons:
-  apt:
-    packages:
-    - jq
-
-jobs:
-  include:
-    - stage: test
-      script:
-        - git ls-files --exclude='*Dockerfile' --ignored | xargs --max-lines=1 -I{} sh -c 'docker run --rm -i -v ${PWD}/.hadolint.yaml:/.hadolint.yaml hadolint/hadolint < "$1"' -- {}
-        - bash -c 'shopt -s globstar; shellcheck **/*.sh'
-    - &build
-      stage: build
-      env: VERSION_SHORT=0.17 EXTRA_TAG=latest
-      script:
-        - ./build.sh $VERSION_SHORT
-    - <<: *build
-      env: VERSION_SHORT=0.16 EXTRA_TAG=stable
-    - <<: *build
-      env: VERSION_SHORT=0.15
-    - <<: *build
-      env: VERSION_SHORT=0.14

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

@@ -1,20 +1,22 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
+FROM frolvlad/alpine-glibc:alpine-3.4
 
-LABEL maintainer="https://github.com/factoriotools/factorio-docker"
+MAINTAINER https://github.com/dtandersen/docker_factorio_server
 
-ENV VERSION=0.14.23 \
-    SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a
+COPY ./factorio.crt /opt/factorio.crt
 
-RUN mkdir -p /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
+ENV VERSION=0.14.17 \
+    SHA1=ffb248fabed345aafadb6a8cdef3684312ac240f
+
+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
 

0.14/build.sh

@@ -1,2 +1 @@
-#!/bin/sh
-sudo docker build --no-cache -t factorio .
+sudo docker build -t factorio .

0.14/clean.sh

@@ -1,2 +1 @@
-#!/bin/sh
 sudo rm -rf /tmp/factorio

0.14/docker-entrypoint.sh

@@ -1,35 +1,35 @@
 #!/bin/sh -x
 
-set -euo pipefail
+set -e
 
 SAVES=/factorio/saves
 CONFIG=/factorio/config
 
-mkdir -p "$SAVES"
+mkdir -p $SAVES
 mkdir -p /factorio/mods
-mkdir -p "$CONFIG"
+mkdir -p $CONFIG
 
 if [ ! -f $CONFIG/rconpw ]; then
-  pwgen 15 1 >"$CONFIG/rconpw"
+  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"
+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"
+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
+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"
+    --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" \
+  --server-settings $CONFIG/server-settings.json \
   --rcon-port 27015 \
-  --rcon-password "$(cat "$CONFIG/rconpw")"
+  --rcon-password "$(cat $CONFIG/rconpw)"

0.14/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.14/run.sh

@@ -1,4 +1,3 @@
-#!/bin/sh
 sudo docker run --rm -it \
 	-v /tmp/factorio:/factorio \
 	--name factorio \

0.15/Dockerfile

@@ -1,30 +0,0 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
-
-LABEL maintainer="https://github.com/factoriotools/factorio-docker"
-
-ENV PORT=34197 \
-    RCON_PORT=27015 \
-    VERSION=0.15.40 \
-    SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec
-
-RUN mkdir -p /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

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

0.15/docker-entrypoint.sh

@@ -1,43 +0,0 @@
-#!/bin/sh -x
-
-set -euo pipefail
-
-SAVES=/factorio/saves
-CONFIG=/factorio/config
-
-mkdir -p "$SAVES"
-mkdir -p /factorio/mods
-mkdir -p "$CONFIG"
-
-if [ ! -f "$CONFIG/rconpw" ]; then
-  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

@@ -1,46 +0,0 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
-
-LABEL maintainer="https://github.com/factoriotools/factorio-docker"
-
-ARG USER=factorio
-ARG GROUP=factorio
-ARG PUID=845
-ARG PGID=845
-
-ENV PORT=34197 \
-    RCON_PORT=27015 \
-    VERSION=0.16.51 \
-    SHA1=127e7ff484ab263b13615d6114013ce0a66ac929 \
-    SAVES=/factorio/saves \
-    CONFIG=/factorio/config \
-    MODS=/factorio/mods \
-    SCENARIOS=/factorio/scenarios \
-    SCRIPTOUTPUT=/factorio/script-output \
-    PUID="$PUID" \
-    PGID="$PGID"
-
-RUN mkdir -p /opt /factorio \
-    && apk add --update --no-cache pwgen su-exec shadow \
-    && 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 $SAVES /opt/factorio/saves \
-    && ln -s $MODS /opt/factorio/mods \
-    && ln -s $SCENARIOS /opt/factorio/scenarios \
-    && ln -s $SCRIPTOUTPUT /opt/factorio/script-output \
-    && 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 files/ /
-
-ENTRYPOINT ["/docker-entrypoint.sh"]

0.16/docker-compose.yml

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

0.16/files/docker-entrypoint.sh

@@ -1,62 +0,0 @@
-#!/bin/sh -x
-set -euo pipefail
-
-id
-
-FACTORIO_VOL=/factorio
-mkdir -p "$FACTORIO_VOL"
-mkdir -p "$SAVES"
-mkdir -p "$CONFIG"
-mkdir -p "$MODS"
-mkdir -p "$SCENARIOS"
-mkdir -p "$SCRIPTOUTPUT"
-
-if [ ! -f "$CONFIG/rconpw" ]; then
-  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 \*.tmp.zip -mindepth 1 -print | grep -q .; then
-  rm -f "$SAVES"/*.tmp.zip
-fi
-
-if [ "$(id -u)" = '0' ]; then
-  # Update the User and Group ID based on the PUID/PGID variables
-  usermod -o -u "$PUID" factorio
-  groupmod -o -g "$PGID" factorio
-  # Take ownership of factorio data if running as root
-  chown -R factorio:factorio "$FACTORIO_VOL"
-  # Drop to the factorio user
-  SU_EXEC="su-exec factorio"
-else
-  SU_EXEC=""
-fi
-
-if ! find -L "$SAVES" -iname \*.zip -mindepth 1 -print | grep -q .; then
-  $SU_EXEC /opt/factorio/bin/x64/factorio \
-    --create "$SAVES/_autosave1.zip" \
-    --map-gen-settings "$CONFIG/map-gen-settings.json" \
-    --map-settings "$CONFIG/map-settings.json"
-fi
-
-$SU_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/files/scenario.sh

@@ -1,42 +0,0 @@
-#!/bin/sh -x
-if [ -z "$1" ]; then
-  echo "No argument supplied"
-fi
-SERVER_SCENARIO=$1
-
-set -euo pipefail
-
-id
-
-mkdir -p "$SAVES"
-mkdir -p "$CONFIG"
-mkdir -p "$MODS"
-mkdir -p "$SCENARIOS"
-
-#chown -R factorio /factorio
-
-if [ ! -f "$CONFIG/rconpw" ]; then
-  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 "$SERVER_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/files/scenario2map.sh

@@ -1,29 +0,0 @@
-#!/bin/sh -x
-if [ -z "$1" ]; then
-  echo "No argument supplied"
-fi
-SERVER_SCENARIO=$1
-
-set -euo pipefail
-
-id
-
-mkdir -p "$SAVES"
-mkdir -p "$CONFIG"
-mkdir -p "$MODS"
-mkdir -p "$SCENARIOS"
-
-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 "$SERVER_SCENARIO"

0.17/Dockerfile

@@ -1,46 +0,0 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
-
-LABEL maintainer="https://github.com/factoriotools/factorio-docker"
-
-ARG USER=factorio
-ARG GROUP=factorio
-ARG PUID=845
-ARG PGID=845
-
-ENV PORT=34197 \
-    RCON_PORT=27015 \
-    VERSION=0.17.65 \
-    SHA1=521b601b0be04520ae6d6a04bdfc9c7db897f85d \
-    SAVES=/factorio/saves \
-    CONFIG=/factorio/config \
-    MODS=/factorio/mods \
-    SCENARIOS=/factorio/scenarios \
-    SCRIPTOUTPUT=/factorio/script-output \
-    PUID="$PUID" \
-    PGID="$PGID"
-
-RUN set -ox pipefail \
-    && archive="/tmp/factorio_headless_x64_$VERSION.tar.xz" \
-    && mkdir -p /opt /factorio \
-    && apk add --update --no-cache --no-progress bash binutils curl file gettext jq libintl pwgen shadow su-exec \
-    && curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" -o "$archive" \
-    && echo "$SHA1  $archive" | sha1sum -c \
-    || (sha1sum "$archive" && file "$archive" && exit 1) \
-    && tar xf "$archive" --directory /opt \
-    && chmod ugo=rwx /opt/factorio \
-    && rm "$archive" \
-    && ln -s "$SAVES" /opt/factorio/saves \
-    && ln -s "$MODS" /opt/factorio/mods \
-    && ln -s "$SCENARIOS" /opt/factorio/scenarios \
-    && ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output \
-    && 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 files/ /
-
-ENTRYPOINT ["/docker-entrypoint.sh"]

0.17/docker-compose.yml

@@ -1,15 +0,0 @@
-version: '2'
-services:
-  factorio:
-    build: .
-    ports:
-     - "34197:34197/udp"
-     - "27015:27015/tcp"
-    volumes:
-     - /opt/factorio:/factorio
-#    environment:
-#      - PUID=1000
-#      - PGID=1000
-#      - UPDATE_MODS_ON_START=true
-#      - USERNAME=FactorioUsername
-#      - TOKEN=FactorioToken

0.17/files/docker-entrypoint.sh

@@ -1,73 +0,0 @@
-#!/bin/bash
-set -eoux pipefail
-
-FACTORIO_VOL=/factorio
-mkdir -p "$FACTORIO_VOL"
-mkdir -p "$SAVES"
-mkdir -p "$CONFIG"
-mkdir -p "$MODS"
-mkdir -p "$SCENARIOS"
-mkdir -p "$SCRIPTOUTPUT"
-
-if [[ ! -f $CONFIG/rconpw ]]; then
-  # Generate a new RCON password if none exists
-  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"
-fi
-
-if [[ ! -f $CONFIG/map-settings.json ]]; then
-  cp /opt/factorio/data/map-settings.example.json "$CONFIG/map-settings.json"
-fi
-
-NRTMPSAVES=$( find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 | wc -l )
-if [[ $NRTMPSAVES -gt 0 ]]; then
-  # Delete incomplete saves (such as after a forced exit)
-  rm -f "$SAVES"/*.tmp.zip
-fi
-
-if [[ ${UPDATE_MODS_ON_START:-} ]]; then
-  ./docker-update-mods.sh
-fi
-
-if [[ $(id -u) = 0 ]]; then
-  # Update the User and Group ID based on the PUID/PGID variables
-  usermod -o -u "$PUID" factorio
-  groupmod -o -g "$PGID" factorio
-  # Take ownership of factorio data if running as root
-  chown -R factorio:factorio "$FACTORIO_VOL"
-  # Drop to the factorio user
-  SU_EXEC="su-exec factorio"
-else
-  SU_EXEC=""
-fi
-
-NRSAVES=$(find -L "$SAVES" -iname \*.zip -mindepth 1 | wc -l)
-if [[ $NRSAVES -eq 0 ]]; then
-  # Generate a new map if no save ZIPs exist
-  $SU_EXEC /opt/factorio/bin/x64/factorio \
-    --create "$SAVES/_autosave1.zip" \
-    --map-gen-settings "$CONFIG/map-gen-settings.json" \
-    --map-settings "$CONFIG/map-settings.json"
-fi
-
-# shellcheck disable=SC2086
-exec $SU_EXEC /opt/factorio/bin/x64/factorio \
-  --port "$PORT" \
-  --start-server-load-latest \
-  --server-settings "$CONFIG/server-settings.json" \
-  --server-banlist "$CONFIG/server-banlist.json" \
-  --rcon-port "$RCON_PORT" \
-  --server-whitelist "$CONFIG/server-whitelist.json" \
-  --use-server-whitelist \
-  --server-adminlist "$CONFIG/server-adminlist.json" \
-  --rcon-password "$(cat "$CONFIG/rconpw")" \
-  --server-id /factorio/config/server-id.json \
-  "$@"

0.17/files/docker-update-mods.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-set -eou pipefail
-
-if [[ -f /run/secrets/username ]]; then
-  USERNAME=$(cat /run/secrets/username)
-fi
-
-if [[ -f /run/secrets/username ]]; then
-  TOKEN=$(cat /run/secrets/token)
-fi
-
-if [[ -z ${USERNAME:-} ]]; then
-  USERNAME="$(jq -j ".username" "$CONFIG/server-settings.json")"
-fi
-
-if [[ -z ${TOKEN:-} ]]; then
-  TOKEN="$(jq -j ".token" "$CONFIG/server-settings.json")"
-fi
-
-if [[ -z ${USERNAME:-} ]]; then
-  echo "You need to provide your Factorio username to update mods."
-fi
-
-if [[ -z ${TOKEN:-} ]]; then
-  echo "You need to provide your Factorio token to update mods."
-fi
-
-./update-mods.sh "$VERSION" "$MODS" "$USERNAME" "$TOKEN"

0.17/files/scenario.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-set -eoux pipefail
-
-if [[ -z ${1:-} ]]; then
-  echo "No argument supplied"
-fi
-
-SERVER_SCENARIO="$1"
-mkdir -p "$SAVES"
-mkdir -p "$CONFIG"
-mkdir -p "$MODS"
-mkdir -p "$SCENARIOS"
-
-#chown -R factorio /factorio
-
-if [[ ! -f $CONFIG/rconpw ]]; then
-  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 "$SERVER_SCENARIO" \
-  --server-settings "$CONFIG/server-settings.json" \
-  --server-banlist "$CONFIG/server-banlist.json" \
-  --server-whitelist "$CONFIG/server-whitelist.json" \
-  --use-server-whitelist \
-  --server-adminlist "$CONFIG/server-adminlist.json" \
-  --rcon-port "$RCON_PORT" \
-  --rcon-password "$(cat "$CONFIG/rconpw")" \
-  --server-id /factorio/config/server-id.json

0.17/files/scenario2map.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-set -eoux pipefail
-
-if [[ -z ${1:-} ]]; then
-  echo "No argument supplied"
-fi
-
-SERVER_SCENARIO="$1"
-mkdir -p "$SAVES"
-mkdir -p "$CONFIG"
-mkdir -p "$MODS"
-mkdir -p "$SCENARIOS"
-
-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 "$SERVER_SCENARIO"

0.17/files/update-mods.sh

@@ -1,94 +0,0 @@
-#!/bin/bash
-set -eou pipefail
-
-FACTORIO_VERSION=$1
-MOD_DIR=$2
-USERNAME=$3
-TOKEN=$4
-
-MOD_BASE_URL="https://mods.factorio.com"
-
-print_step()
-{
-  echo "$1"
-}
-
-print_success()
-{
-  echo "$1"
-}
-
-print_failure()
-{
-  echo "$1"
-}
-
-update_mod()
-{
-  MOD_NAME="${1// /%20}"
-
-  print_step "Checking for update of mod $MOD_NAME..."
-
-  MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
-  MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")
-
-  MOD_INFO=$(echo "$MOD_INFO_JSON" | jq -j --arg version "$FACTORIO_VERSION" ".releases|reverse|map(select(.info_json.factorio_version as \$mod_version | \$version | startswith(\$mod_version)))[0]|.file_name, \";\", .download_url, \";\", .sha1")
-
-  MOD_FILENAME=$(echo "$MOD_INFO" | cut -f1 -d";")
-  MOD_URL=$(echo "$MOD_INFO" | cut -f2 -d";")
-  MOD_SHA1=$(echo "$MOD_INFO" | cut -f3 -d";")
-
-  if [[ -z $MOD_URL ]]; then
-    return 1
-  fi
-
-  if [[ $MOD_FILENAME == null ]]; then
-    print_failure "  Not compatible with version"
-    return 1
-  fi
-
-  if [[ -f $MOD_DIR/$MOD_FILENAME ]]; then
-    print_success "  Already up-to-date."
-    return 0
-  fi
-
-  print_step "Downloading..."
-  FULL_URL="$MOD_BASE_URL$MOD_URL?username=$USERNAME&token=$TOKEN"
-  HTTP_STATUS=$(curl --silent -L -w "%{http_code}" -o "$MOD_DIR/$MOD_FILENAME" "$FULL_URL")
-
-  if [[ $HTTP_STATUS != 200 ]]; then
-    print_failure "  Download failed: Code $HTTP_STATUS."
-    rm "$MOD_DIR/$MOD_FILENAME"
-    return 1
-  fi
-
-  if [[ ! -f $MOD_DIR/$MOD_FILENAME ]]; then
-    print_failure "  Downloaded file missing!"
-    return 1
-  fi
-
-  if ! [[ $(sha1sum "$MOD_DIR/$MOD_FILENAME") =~ $MOD_SHA1 ]]; then
-    print_failure "  SHA1 mismatch!"
-    rm "$MOD_DIR/$MOD_FILENAME"
-    return 1
-  fi
-
-  print_success "  Download complete."
-
-  for file in "$MOD_DIR/${MOD_NAME}_"*".zip"; do # wildcard does usually not work in quotes: https://unix.stackexchange.com/a/67761
-    if [[ $file != $MOD_DIR/$MOD_FILENAME ]]; then
-      print_success "  Deleting old version: $file"
-      rm "$file"
-    fi
-  done
-
-  return 0
-}
-
-if [[ -f $MOD_DIR/mod-list.json ]]; then
-  jq -r ".mods|map(select(.enabled))|.[].name" "$MOD_DIR/mod-list.json" | while read -r mod; do
-    if [[ $mod != base ]]; then
-      update_mod "$mod"
-    fi
-  done
-fi

README.md

@@ -1,18 +1,8 @@
-# Factorio [![Build Status](https://travis-ci.org/factoriotools/factorio-docker.svg?branch=master)](https://travis-ci.org/factoriotools/factorio-docker)  [![Docker Version](https://images.microbadger.com/badges/version/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Pulls](https://img.shields.io/docker/pulls/factoriotools/factorio.svg?maxAge=600)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/factoriotools/factorio.svg?maxAge=600)](https://hub.docker.com/r/factoriotools/factorio/) [![Microbadger Layers](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com")
-
-* `0.17.65`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
-* `0.16.51`, `0.16`, `stable` [(0.16/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.16/Dockerfile)
-* `0.15.40`, `0.15` [(0.15/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.15/Dockerfile)
-* `0.14.23`, `0.14` [(0.14/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.14/Dockerfile)
-
-*Tag descriptions*
-
-* `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-z` - incremental fix for that version.
+# Factorio [![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.14.17`, `0.14`, `latest` [(0.14.17/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/0.14.17/0.14/Dockerfile)
+* `0.14.16` [(0.14.16/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/0.14.16/0.14/Dockerfile)
+* `0.13.20`, `0.13`, `stable` [(0.13.20/Dockerfile)](https://github.com/dtandersen/docker_factorio_server/blob/0.13.20/0.13/Dockerfile)
 
 # What is Factorio?
 
@@ -29,30 +19,19 @@ NOTE: This is only the server. The game is available at [factorio.com](https://w
 
 ## Quick Start
 
-Run the server to create the necessary folder structure and configuration files. For this example data is stored in `/opt/factorio`.
+Run the server to create the necessary folder structure and configuration files. For this example data is stored in `/tmp/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 \
-  factoriotools/factorio
+docker run -d -P -v /tmp/factorio:/factorio --name factorio 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
+* `-P` - Expose all ports.
+* `-v` - Mount `/tmp/factorio` on the local file system to `/factorio` in the container.
 * `--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:
 
 ```
@@ -65,7 +44,7 @@ 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:
+Now there's a `server-settings.json` file in the folder `/tmp/factorio/config`. Modify this to your liking and restart the server:
 
 ```
 docker start factorio
@@ -74,34 +53,9 @@ 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 \
-        factoriotools/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 factoriotools/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.
+A new map named `_autosave1.zip` is generated the first time the server is started. The `map-gen-settings.json` file in `/tmp/factorio/config` is 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.
 
@@ -112,100 +66,14 @@ To generate a new map stop the server, delete all of the saves and restart the s
 
 Copy mods into the mods folder and restart the server.
 
-As of 0.17 a new environment variable was added ``UPDATE_MODS_ON_START`` which if set to ``true`` will cause the mods get to updated on server start. If set a valid [Factorio Username and Token](https://www.factorio.com/profile) must be supplied or else the server will not start. They can either be set as docker secrets, environment variables, or pulled from the server-settings.json file.
-
-
-## 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 "/scenario.sh" \
-  factoriotools/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 usage 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 "/scenario2map.sh" \
-  factoriotools/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 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"
-	]
-
-## 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"
-    ]
-
-## Customize configuration files (0.17.x+)
-
-Out-of-the box, factorio does not support environment variables inside the configuration files. A workaround is the usage of `envsubst` which generates the configuration files dynamically during startup from environment variables set in docker-compose:
-
-Example which replaces the server-settings.json:
-
-
-	factorio_1:
-	  image: factoriotools/factorio
-	  ports:
-	    - "34197:34197/udp"
-	  volumes:
-	   - /opt/factorio:/factorio
-	   - ./server-settings.json:/server-settings.json
-	  environment:
-	    - INSTANCE_NAME=Your Instance's Name
-	    - INSTANCE_DESC=Your Instance's Description
-	  entrypoint: /bin/sh -c "mkdir -p /factorio/config && envsubst < /server-settings.json > /factorio/config/server-settings.json && exec /docker-entrypoint.sh"
-
-The `server-settings.json` file may then contain the variable references like this:
-
-	"name": "${INSTANCE_NAME}",
-	"description": "${INSTANCE_DESC}",
+To "disable" RCON don't expose port 27015, i.e. start the server with `-p 34197:34197/udp` instead of `-P`. RCON still runs, but nobody is able to connect to it.
 
 
 # Container Details
@@ -221,132 +89,35 @@ The philosophy is to [keep it simple](http://wiki.c2.com/?KeepItSimple).
 
 To keep things simple, the container uses a single volume mounted at `/factorio`. This volume stores configuration, mods, and saves.
 
-The files in this volume should be owned by the factorio user, uid 845.
-
     factorio
     |-- config
     |   |-- map-gen-settings.json
-    |   |-- map-settings.json
     |   |-- rconpw
-    |   |-- server-adminlist.json
-    |   |-- server-banlist.json
-    |   |-- server-settings.json
-    |   `-- server-whitelist.json
+    |   `-- server-settings.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/factoriotools/factorio-docker/blob/master/0.17/docker-compose.yml) file. To get it from this repository:
-
-```
-git clone https://github.com/factoriotools/factorio-docker.git
-cd docker_factorio_server/0.17
-```
-
-Or make your own:
-
-```
-version: '2'
-services:
-  factorio:
-    image: factoriotools/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).
+* `34197/udp` - Factorio clients (required).
 * `27015/tcp` - RCON (optional).
 
 
-## Environment Variables
-
-* `PORT` (0.15+) - Start the server on an alternate port, .e.g. `docker run -e "PORT=34198"`.
-* `RCON_PORT` (0.16+) - Start the RCON on an alternate 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  \
-  factoriotools/factorio
-```
-
-## Vagrant
-
-[Vagrant](https://www.vagrantup.com/) is a easy way to setup a virtual machine (VM) to run Docker. The [Factorio Vagrant box repository](https://github.com/dtandersen/factorio-lan-vagrant) contains a sample Vagrantfile.
-
-For LAN games the VM needs an internal IP in order for clients to connect. One way to do this is with a public network. The VM uses DHCP to acquire an IP address. The VM must also forward port 34197.
-
-```
-  config.vm.network "public_network"
-  config.vm.network "forwarded_port", guest: 34197, host: 34197
-```
-
-## Amazon Web Services (AWS) Deployment
-
-If you're looking for a simple way to deploy this to the Amazon Web Services Cloud, check out the [Factorio Server Deployment (CloudFormation) repository](https://github.com/m-chandler/factorio-spot-pricing). This repository contains a CloudFormation template that will get you up and running in AWS in a matter of minutes. Optionally it uses Spot Pricing so the server is very cheap, and you can easily turn it off when not in use.
-
 ## Troubleshooting
 
-**My server is listed in the server browser, but nobody can connect**
+**Server is listed in the in-game server browser, but users can't 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 outgoing traffic through a proxy. The source UDP port is changed by the proxy so the server list detects the wrong port. See [Incorrect port detected for docker hosted server](https://forums.factorio.com/viewtopic.php?f=49&t=35255).
 
-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.
+To fix this problem, start the Docker service with the `--userland-proxy=false` switch to prevent it from using a proxy. This is typically done by appending the switch to the `DOCKER_OPTS` variable or adding it to the end of `ExecStart` in the systemd service definition. The location of these files varies by OS.
 
 
-# Contributors
+# Credits
 
-* [dtandersen](https://github.com/dtandersen) - Maintainer
-* [Fank](https://github.com/Fankserver) - Keeper of the Factorio watchdog that keeps the version up-to-date.
-* [SuperSandro2000](https://github.com/supersandro2000) - CI Guy, Maintainer and runner of the Factorio watchdog, contributed version updates
-* [DBendit](https://github.com/DBendit/docker_factorio_server) - Coded admin list, ban list support and contributed version updates
-* [Zopanix](https://github.com/zopanix/docker_factorio_server) - Original Author
-* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio) - Coded randomly generated RCON password
-* [gnomus](https://github.com/gnomus/docker_factorio_server) - Coded wite listing support
-* [bplein](https://github.com/bplein/docker_factorio_server) - Coded scenario support
-* [jaredledvina](https://github.com/jaredledvina/docker_factorio_server) - Contributed version updates
-* [carlbennett](https://github.com/carlbennett) - Contributed version updates and bugfixes
+Ideas borrowed from:
+
+* [Zopanix](https://github.com/zopanix/docker_factorio_server)
+* [Rfvgyhn](https://github.com/Rfvgyhn/docker-factorio)

build.sh

@@ -1,77 +0,0 @@
-#!/bin/bash
-set -eoux pipefail
-
-if [[ -z ${1:-} ]] && [[ -n ${CI:-} ]]; then
-  echo "Usage: ./build.sh \$VERSION_SHORT"
-  exit 1
-elif [[ $CI == true ]]; then
-  VERSION_SHORT="$1"
-else
-  VERSION_SHORT=$(find . -maxdepth 1 -type d | sort | tail -1 | grep -o "[[0-9]].[[0-9]]*")
-  EXTRA_TAG=latest
-fi
-
-cd "$VERSION_SHORT" || exit 1
-
-VERSION=$(grep -oP '[0-9]+\.[0-9]+\.[0-9]+' Dockerfile | head -1)
-DOCKER_REPO=factoriotools/factorio
-
-if [[ $TRAVIS_PULL_REQUEST == true ]]; then
-  TAGS="$DOCKER_REPO:$TRAVIS_PULL_REQUEST_SLUG"
-else
-  # we are either on master or on a tag build
-  if [[ $TRAVIS_BRANCH == master ]] || [[ $TRAVIS_BRANCH == "$VERSION" ]]; then
-    TAGS="$DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
-  # we are on an incremental build of a tag
-  elif [[ $VERSION == "${TRAVIS_BRANCH%-*}" ]]; then
-    TAGS="$DOCKER_REPO:$TRAVIS_BRANCH -t $DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
-  # we build a other branch than master
-  elif [[ -n $TRAVIS_BRANCH ]]; then
-    TAGS="$DOCKER_REPO:$TRAVIS_BRANCH"
-  # we are not in CI and tag version and version short
-  elif [[ $CI == "" ]]; then
-    TAGS="$DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
-  fi
-
-  if [[ -n ${EXTRA_TAG:-} ]]; then
-    TAGS="$TAGS -t $DOCKER_REPO:$EXTRA_TAG"
-  fi
-fi
-
-# shellcheck disable=SC2086
-docker build . -t $TAGS
-docker images
-
-# only push when:
-# latest changes where made in the folder corosponding to the version we build, we are on master and don#t build a PR.
-if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRAVIS_BRANCH == master ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
-  # we build a tag and we are not on master
-  [[ $VERSION == "${TRAVIS_BRANCH%-*}" ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
-  # we are not in CI
-  [[ $CI == "" ]]; then
-
-  if [[ $CI == true ]]; then
-    echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-  fi
-
-  # push a tag on a branch other than master
-  if [[ -n $TRAVIS_BRANCH ]] && [[ $VERSION != "${TRAVIS_BRANCH%-*}" ]] && [[ $TRAVIS_BRANCH != "master" ]]; then
-    docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
-  fi
-
-  # push an incremental tag
-  if [[ $VERSION == "${TRAVIS_BRANCH%-*}" ]]; then
-    docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
-  fi
-
-  if [[ -n $TRAVIS_TAG ]] || [[ $CI == "" ]]; then
-    docker push "$DOCKER_REPO:$VERSION"
-    docker push "$DOCKER_REPO:$VERSION_SHORT"
-  fi
-
-  if [[ -n ${EXTRA_TAG:-} ]]; then
-    docker push "$DOCKER_REPO:$EXTRA_TAG"
-  fi
-
-  curl -X POST https://hooks.microbadger.com/images/factoriotools/factorio/TmmKGNp8jKcFqZvcJhTCIAJVluw=
-fi

lint.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-git ls-files --exclude='*Dockerfile' --ignored | xargs --max-lines=1 ./hadolint