Update to Factorio 0.17.74

hopefully!

.travis.yml

@@ -16,11 +16,12 @@ jobs:
         - bash -c 'shopt -s globstar; shellcheck **/*.sh'
     - &build
       stage: build
+      # set EXTRA_TAG to latest,stable when no more experimental versions for 0.17 come out
       env: VERSION_SHORT=0.17 EXTRA_TAG=latest
       script:
         - ./build.sh $VERSION_SHORT
     - <<: *build
-      env: VERSION_SHORT=0.16 EXTRA_TAG=stable
+      env: VERSION_SHORT=0.16
     - <<: *build
       env: VERSION_SHORT=0.15
     - <<: *build

0.14/Dockerfile

@@ -5,16 +5,16 @@ LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 ENV VERSION=0.14.23 \
     SHA1=6ef84341c6fc1cf45cfdd6acc8468aaa117b9e8a
 
-RUN mkdir -p /opt && \
+RUN mkdir -p /opt \
-    apk --no-cache add curl tini pwgen && \
+    && apk --no-cache add curl tini pwgen \
-    curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
+    && curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
-        -o /tmp/factorio_headless_x64_$VERSION.tar.gz && \
+        -o /tmp/factorio_headless_x64_$VERSION.tar.gz \
-    echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c && \
+    && echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c \
-    tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz --directory /opt && \
+    && tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz --directory /opt \
-    rm /tmp/factorio_headless_x64_$VERSION.tar.gz && \
+    && rm /tmp/factorio_headless_x64_$VERSION.tar.gz \
-    apk del curl && \
+    && apk del curl \
-    ln -s /factorio/saves /opt/factorio/saves && \
+    && ln -s /factorio/saves /opt/factorio/saves \
-    ln -s /factorio/mods /opt/factorio/mods
+    && ln -s /factorio/mods /opt/factorio/mods
 
 VOLUME /factorio
 

0.15/Dockerfile

@@ -7,18 +7,18 @@ ENV PORT=34197 \
     VERSION=0.15.40 \
     SHA1=f79a975f6b8c0ee87e2fa60f7d1f7133f332c3ec
 
-RUN mkdir -p /opt && \
+RUN mkdir -p /opt \
-    apk add --update --no-cache tini pwgen && \
+    && apk add --update --no-cache tini pwgen \
-    apk add --update --no-cache --virtual .build-deps curl && \
+    && apk add --update --no-cache --virtual .build-deps curl \
-    curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
+    && curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
-        -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
+        -o /tmp/factorio_headless_x64_$VERSION.tar.xz \
-    echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
+    && echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c \
-    tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
+    && tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt \
-    chmod -R ugo=rwx /opt/factorio && \
+    && chmod -R ugo=rwx /opt/factorio \
-    rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
+    && rm /tmp/factorio_headless_x64_$VERSION.tar.xz \
-    ln -s /factorio/saves /opt/factorio/saves && \
+    && ln -s /factorio/saves /opt/factorio/saves \
-    ln -s /factorio/mods /opt/factorio/mods && \
+    && ln -s /factorio/mods /opt/factorio/mods \
-    apk del .build-deps
+    && apk del .build-deps
 
 VOLUME /factorio
 

0.16/Dockerfile

@@ -19,23 +19,23 @@ ENV PORT=34197 \
     PUID="$PUID" \
     PGID="$PGID"
 
-RUN mkdir -p /opt /factorio && \
+RUN mkdir -p /opt /factorio \
-    apk add --update --no-cache pwgen su-exec shadow && \
+    && apk add --update --no-cache pwgen su-exec shadow \
-    apk add --update --no-cache --virtual .build-deps curl && \
+    && apk add --update --no-cache --virtual .build-deps curl \
-    curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
+    && curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
-        -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
+        -o /tmp/factorio_headless_x64_$VERSION.tar.xz \
-    echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
+    && echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c \
-    tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt && \
+    && tar xf /tmp/factorio_headless_x64_$VERSION.tar.xz --directory /opt \
-    chmod ugo=rwx /opt/factorio && \
+    && chmod ugo=rwx /opt/factorio \
-    rm /tmp/factorio_headless_x64_$VERSION.tar.xz && \
+    && rm /tmp/factorio_headless_x64_$VERSION.tar.xz \
-    ln -s $SAVES /opt/factorio/saves && \
+    && ln -s $SAVES /opt/factorio/saves \
-    ln -s $MODS /opt/factorio/mods && \
+    && ln -s $MODS /opt/factorio/mods \
-    ln -s $SCENARIOS /opt/factorio/scenarios && \
+    && ln -s $SCENARIOS /opt/factorio/scenarios \
-    ln -s $SCRIPTOUTPUT /opt/factorio/script-output && \
+    && ln -s $SCRIPTOUTPUT /opt/factorio/script-output \
-    apk del .build-deps && \
+    && apk del .build-deps \
-    addgroup -g $PGID -S $GROUP && \
+    && addgroup -g $PGID -S $GROUP \
-    adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER && \
+    && adduser -u $PUID -G $GROUP -s /bin/sh -SDH $USER \
-    chown -R $USER:$GROUP /opt/factorio /factorio
+    && chown -R $USER:$GROUP /opt/factorio /factorio
 
 VOLUME /factorio
 

0.17/Dockerfile

@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.17.56 \
+    VERSION=0.17.74 \
-    SHA1=fdf609a314ab4100b1547b92f718ec24bc9c0eb4 \
+    SHA1=ed275564687e91bed3a969ddf8907560c9cfe431 \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \
@@ -19,21 +19,23 @@ ENV PORT=34197 \
     PUID="$PUID" \
     PGID="$PGID"
 
-RUN mkdir -p /opt /factorio && \
+RUN set -ox pipefail \
-    apk add --update --no-cache --no-progress bash binutils curl gettext jq libintl pwgen shadow su-exec && \
+    && archive="/tmp/factorio_headless_x64_$VERSION.tar.xz" \
-    curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" \
+    && mkdir -p /opt /factorio \
-        -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
+    && apk add --update --no-cache --no-progress bash binutils curl file gettext jq libintl pwgen shadow su-exec \
-    echo "$SHA1  /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \
+    && curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" -o "$archive" \
-    tar xf "/tmp/factorio_headless_x64_$VERSION.tar.xz" --directory /opt && \
+    && echo "$SHA1  $archive" | sha1sum -c \
-    chmod ugo=rwx /opt/factorio && \
+    || (sha1sum "$archive" && file "$archive" && exit 1) \
-    rm "/tmp/factorio_headless_x64_$VERSION.tar.xz" && \
+    && tar xf "$archive" --directory /opt \
-    ln -s "$SAVES" /opt/factorio/saves && \
+    && chmod ugo=rwx /opt/factorio \
-    ln -s "$MODS" /opt/factorio/mods && \
+    && rm "$archive" \
-    ln -s "$SCENARIOS" /opt/factorio/scenarios && \
+    && ln -s "$SAVES" /opt/factorio/saves \
-    ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output && \
+    && ln -s "$MODS" /opt/factorio/mods \
-    addgroup -g "$PGID" -S "$GROUP" && \
+    && ln -s "$SCENARIOS" /opt/factorio/scenarios \
-    adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" && \
+    && ln -s "$SCRIPTOUTPUT" /opt/factorio/script-output \
-    chown -R "$USER":"$GROUP" /opt/factorio /factorio
+    && addgroup -g "$PGID" -S "$GROUP" \
+    && adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \
+    && chown -R "$USER":"$GROUP" /opt/factorio /factorio
 
 VOLUME /factorio
 

0.17/files/scenario.sh

@@ -33,8 +33,10 @@ 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" \
+  --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

README.md

@@ -1,7 +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.56`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
+* `0.17.74`, `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.17.74` `stable` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
+* `0.16.51`, `0.16` [(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)
 
@@ -22,7 +23,7 @@ You will be mining resources, researching technologies, building infrastructure,
 
 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/).
+NOTE: This is only the server. The full game is available at [Factorio.com](https://www.factorio.com), [Steam](https://store.steampowered.com/app/427520/), [GOG.com](https://www.gog.com/game/factorio) and [Humble Bundle](https://www.humblebundle.com/store/factorio).
 
 
 # Usage

build.sh

@@ -2,9 +2,9 @@
 set -eoux pipefail
 
 if [[ -z ${1:-} ]] && [[ -n ${CI:-} ]]; then
-  echo "Usage: ./build.sh \$VERSION_SHORT"
+  echo 'Usage: ./build.sh VERSION_SHORT'
   exit 1
-elif [[ $CI == true ]]; then
+elif [[ ${CI:-} == true ]] || [[ -n ${1:-} ]]; then
   VERSION_SHORT="$1"
 else
   VERSION_SHORT=$(find . -maxdepth 1 -type d | sort | tail -1 | grep -o "[[0-9]].[[0-9]]*")
@@ -16,61 +16,73 @@ 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
+if [[ ${TRAVIS_PULL_REQUEST:-} == true ]]; then
   TAGS="$DOCKER_REPO:$TRAVIS_PULL_REQUEST_SLUG"
 else
+  if [[ -n ${CI:-} ]]; then
     # 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"
+      TAGS="-t $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"
+      TAGS="-t $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"
+      TAGS="-t $DOCKER_REPO:$TRAVIS_BRANCH"
+    fi
+  else
     # we are not in CI and tag version and version short
-  elif [[ $CI == "" ]]; then
+    TAGS="-t $DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
-    TAGS="$DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
   fi
 
   if [[ -n ${EXTRA_TAG:-} ]]; then
-    TAGS="$TAGS -t $DOCKER_REPO:$EXTRA_TAG"
+    IFS=","
+    for TAG in $EXTRA_TAG; do
+      TAGS+=" -t $DOCKER_REPO:$EXTRA_TAG"
+    done
   fi
 fi
 
-# shellcheck disable=SC2086
+# shellcheck disable=SC2068
-docker build . -t $TAGS
+eval docker build . ${TAGS[@]}
 docker images
 
+if [[ ${TRAVIS_BRANCH:-} ]]; then
+  TRAVIS_BRANCH_VERSION=${TRAVIS_BRANCH%-*}
+fi
+
 # 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 == "" ]] ||
+  [[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
   # we are not in CI
-  [[ $CI == "" ]]; then
+  [[ -z ${CI:-} ]]; then
 
-  if [[ $CI == true ]]; 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
+  if [[ -n ${TRAVIS_BRANCH:-} ]] && [[ $VERSION != "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ ${TRAVIS_BRANCH:-} != "master" ]]; then
     docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
   fi
 
   # push an incremental tag
-  if [[ $VERSION == "${TRAVIS_BRANCH%-*}" ]]; then
+  if [[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]]; then
     docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
   fi
 
-  if [[ -n $TRAVIS_TAG ]] || [[ $CI == "" ]]; then
+  if [[ -n ${TRAVIS_TAG:-} ]] || [[ -z ${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"
+    IFS=","
+    for TAG in $EXTRA_TAG; do
+      docker push "$DOCKER_REPO:$TAG"
+    done
   fi
 
   curl -X POST https://hooks.microbadger.com/images/factoriotools/factorio/TmmKGNp8jKcFqZvcJhTCIAJVluw=