Update to Factorio 0.17.67

update to 0.17.66
Load admin list in scenario (#288 )
2025-07-06 08:58:40 +02:00 · 2019-09-03 12:49:54 +00:00 · 2019-08-16 13:40:26 +00:00 · 2019-08-16 13:58:59 +02:00 · 2019-08-14 11:35:26 +00:00 · 2019-08-11 01:40:33 +02:00
8 changed files with 67 additions and 63 deletions
--- a/0.14/Dockerfile
+++ b/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 && \
-    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
+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

 VOLUME /factorio

--- a/0.15/Dockerfile
+++ b/0.15/Dockerfile
@ -7,18 +7,18 @@ ENV PORT=34197 \
    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
+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

--- a/0.16/Dockerfile
+++ b/0.16/Dockerfile
@ -19,23 +19,23 @@ ENV PORT=34197 \
    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
+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

--- a/0.17/Dockerfile
+++ b/0.17/Dockerfile
@ -9,8 +9,8 @@ ARG PGID=845

 ENV PORT=34197 \
    RCON_PORT=27015 \
-    VERSION=0.17.54 \
-    SHA1=69750604bc9036abdf5e9297dfc975f80b52c573 \
+    VERSION=0.17.67 \
+    SHA1=e23c4be62d1715c57fa3a6a97bc443c7af0f9af1 \
    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 && \
-    apk add --update --no-cache --no-progress bash binutils curl gettext jq libintl pwgen shadow su-exec && \
-    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 && \
-    addgroup -g "$PGID" -S "$GROUP" && \
-    adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" && \
-    chown -R "$USER":"$GROUP" /opt/factorio /factorio
+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

--- a/0.17/files/scenario.sh
+++ b/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
--- a/0.17/files/update-mods.sh
+++ b/0.17/files/update-mods.sh
@ -25,7 +25,7 @@ print_failure()

 update_mod()
 {
-  MOD_NAME="$1"
+  MOD_NAME="${1// /%20}"

  print_step "Checking for update of mod $MOD_NAME..."

--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # 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.54`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
+* `0.17.67`, `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)
--- a/build.sh
+++ b/build.sh
@ -23,7 +23,7 @@ else
  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 [[ $TRAVIS_BRANCH == "${VERSION%-*}" ]]; then
+  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
@ -46,7 +46,7 @@ docker images
 # 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
-  [[ $TRAVIS_BRANCH == "${VERSION%-*}" ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
+  [[ $VERSION == "${TRAVIS_BRANCH%-*}" ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
  # we are not in CI
  [[ $CI == "" ]]; then

@ -55,12 +55,12 @@ if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRA
  fi

  # push a tag on a branch other than master
-  if [[ -n $TRAVIS_BRANCH ]] && [[ $TRAVIS_BRANCH != "${VERSION%-*}" ]] && [[ $TRAVIS_BRANCH != "master" ]]; then
+  if [[ -n $TRAVIS_BRANCH ]] && [[ $VERSION != "${TRAVIS_BRANCH%-*}" ]] && [[ $TRAVIS_BRANCH != "master" ]]; then
    docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
  fi

  # push an incremental tag
-  if [[ $TRAVIS_BRANCH != "${VERSION%-*}" ]]; then
+  if [[ $VERSION == "${TRAVIS_BRANCH%-*}" ]]; then
    docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
  fi
Author	SHA1	Message	Date
SuperSandroBot	4ff8179912	Update to Factorio 0.17.67	2019-09-03 12:49:54 +00:00
SuperSandroBot	db14988396	update to 0.17.66	2019-08-16 13:40:26 +00:00
xxalfa	cd29f2003b	Load admin list in scenario (#288 )	2019-08-16 13:58:59 +02:00
SuperSandroBot	cd2d89a7bc	update to 0.17.65	2019-08-14 11:35:26 +00:00
xxalfa	2d9f646728	Fix whitelist args in scenario entrypoint	2019-08-11 01:40:33 +02:00
SuperSandroBot	9e96ca5aa8	update to 0.17.64	2019-08-09 19:24:45 +00:00
Andrew Holt	5c947846d1	Fix 0.17.63 SHA (#284 )	2019-08-07 13:57:43 +02:00
SuperSandroBot	edd0c95d9b	update to 0.17.63	2019-08-06 12:20:39 +00:00
SuperSandroBot	6651289d6e	update to 0.17.62	2019-08-02 22:37:32 +00:00
SuperSandroBot	784626b689	update to 0.17.61	2019-08-02 17:07:36 +00:00
SuperSandroBot	47ce1706db	update to 0.17.60	2019-07-30 14:37:31 +00:00
Fabricio20	460ba0187d	Update to 0.17.59 (#281 ) * Update Dockerfile * Update README.md	2019-07-26 00:28:10 +02:00
SuperSandroBot	6d496def35	update to 0.17.58	2019-07-15 21:28:01 +00:00
SuperSandroBot	9f8f6da0d2	update to 0.17.57	2019-07-15 17:43:15 +00:00
Sandro Jäckel	71c75671d5	Add debug code when sha match fails	2019-07-13 12:23:01 +02:00
Sandro Jäckel	5a66d1a8df	Revert "Fix 0.17.56 sha" This reverts commit `a48b9d107d`.	2019-07-13 12:22:21 +02:00
Sandro Jäckel	a48b9d107d	Fix 0.17.56 sha	2019-07-13 12:05:08 +02:00
Sandro Jäckel	e5f34134f7	Apply shell-format	2019-07-13 12:04:34 +02:00
SuperSandroBot	5d997bf1c7	update to 0.17.56	2019-07-11 20:13:01 +00:00
SuperSandroBot	7a08cbb04c	update to 0.17.55	2019-07-09 13:33:01 +00:00
Sandro Jäckel	40cc26ca02	URL encode spaces (#276 ) Closes #275	2019-07-08 17:05:18 +02:00
Sandro Jäckel	e8705a44b8	Fix docker push with new incremental tags pt. 3	2019-07-06 17:32:35 +02:00
Sandro Jäckel	fe9875343f	Fix docker push with new incremental tags pt. 2	2019-07-06 17:26:15 +02:00
Sandro Jäckel	06729a6097	Fix docker push with new incremental tags	2019-07-06 17:21:08 +02:00