update to 0.17.49

update to 0.17.48
update to 0.17.47
2025-07-01 14:38:05 +02:00 · 2019-06-13 17:09:11 +00:00 · 2019-06-11 14:14:13 +00:00 · 2019-06-07 15:49:12 +00:00 · 2019-06-07 11:19:11 +00:00 · 2019-05-31 13:14:12 +00:00
7 changed files with 100 additions and 47 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,25 +11,17 @@ addons:
 jobs:
  include:
    - stage: test
-      env: HADOLINT=${HOME}/hadolint
-      install: curl -sLo ${HADOLINT} $(curl -s https://api.github.com/repos/hadolint/hadolint/releases/latest?access_token=${GITHUB_TOKEN} | jq -r '.assets | .[] | select(.name=="hadolint-Linux-x86_64") | .browser_download_url')
-               && chmod 700 ${HADOLINT}
      script:
-        - git ls-files --exclude='*Dockerfile' --ignored | xargs --max-lines=1 ${HADOLINT}
+        - 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=0.17
+      env: VERSION_SHORT=0.17 EXTRA_TAG=latest
      script:
-        - ./build.sh $VERSION
-      after_success:
-        - if [ "$TRAVIS_BRANCH" == "master" ]; then
-            echo "$DOCKER_PASSWORD" | DOCKER login -u "$DOCKER_USERNAME" --password-stdin
-            docker push "factoriotools/docker_factorio_server:$VERSION"
-          fi
+        - ./build.sh $VERSION_SHORT
    - <<: *build
-      env: VERSION=0.16
+      env: VERSION_SHORT=0.16 EXTRA_TAG=stable
    - <<: *build
-      env: VERSION=0.15
+      env: VERSION_SHORT=0.15
    - <<: *build
-      env: VERSION=0.14
+      env: VERSION_SHORT=0.14
--- a/0.16/Dockerfile
+++ b/0.16/Dockerfile
@ -15,10 +15,12 @@ ENV PORT=34197 \
    CONFIG=/factorio/config \
    MODS=/factorio/mods \
    SCENARIOS=/factorio/scenarios \
-    SCRIPTOUTPUT=/factorio/script-output
+    SCRIPTOUTPUT=/factorio/script-output \
+    PUID="$PUID" \
+    PGID="$PGID"

 RUN mkdir -p /opt /factorio && \
-    apk add --update --no-cache pwgen && \
+    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 && \
@ -41,6 +43,4 @@ EXPOSE $PORT/udp $RCON_PORT/tcp

 COPY files/ /

-USER $USER
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
--- a/0.16/files/docker-entrypoint.sh
+++ b/0.16/files/docker-entrypoint.sh
@ -3,6 +3,8 @@ set -euo pipefail

 id

+FACTORIO_VOL=/factorio
+mkdir -p "$FACTORIO_VOL"
 mkdir -p "$SAVES"
 mkdir -p "$CONFIG"
 mkdir -p "$MODS"
@ -26,17 +28,29 @@ if [ ! -f "$CONFIG/map-settings.json" ]; then
 fi

 if find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 -print | grep -q .; then
-  rm -f "$SAVES/*.tmp.zip"
+  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
-  /opt/factorio/bin/x64/factorio \
+  $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

-exec /opt/factorio/bin/x64/factorio \
+$SU_EXEC /opt/factorio/bin/x64/factorio \
  --port "$PORT" \
  --start-server-load-latest \
  --server-settings "$CONFIG/server-settings.json" \
--- a/0.17/Dockerfile
+++ b/0.17/Dockerfile
@ -9,33 +9,33 @@ ARG PGID=845

 ENV PORT=34197 \
    RCON_PORT=27015 \
-    VERSION=0.17.40 \
-    SHA1=56bdcb95dbc6d426a51ea2fdd2ff63789a641db7 \
+    VERSION=0.17.49 \
+    SHA1=c093a42b856f0eb06a22a9a1998984a8cc0e2f62 \
    SAVES=/factorio/saves \
    CONFIG=/factorio/config \
    MODS=/factorio/mods \
    SCENARIOS=/factorio/scenarios \
    SCRIPTOUTPUT=/factorio/script-output \
-    PUID=$PUID \
-    PGID=$PGID
+    PUID="$PUID" \
+    PGID="$PGID"

 RUN mkdir -p /opt /factorio && \
    apk add --update --no-cache pwgen su-exec binutils gettext libintl shadow && \
    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 && \
    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 && \
-    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 && \
+    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
+    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/docker-entrypoint.sh
+++ b/0.17/files/docker-entrypoint.sh
@ -30,9 +30,9 @@ if [ ! -f "$CONFIG/map-settings.json" ]; then
 fi

 NRTMPSAVES=$( find -L "$SAVES" -iname \*.tmp.zip -mindepth 1 | wc -l )
-if [ $NRTMPSAVES -gt 0 ]; then
+if [ "$NRTMPSAVES" -gt 0 ]; then
  # Delete incomplete saves (such as after a forced exit)
-  rm -f "$SAVES/*.tmp.zip"
+  rm -f "$SAVES"/*.tmp.zip
 fi

 if [ "$(id -u)" = '0' ]; then
@ -40,7 +40,7 @@ if [ "$(id -u)" = '0' ]; then
  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
+  chown -R factorio:factorio "$FACTORIO_VOL"
  # Drop to the factorio user
  SU_EXEC="su-exec factorio"
 else
@ -48,7 +48,7 @@ else
 fi

 NRSAVES=$( find -L "$SAVES" -iname \*.zip -mindepth 1 | wc -l )
-if [ $NRSAVES -eq 0 ]; then
+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" \
--- 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) [![](https://images.microbadger.com/badges/version/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio) [![](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/) [![Docker Stars](https://img.shields.io/docker/stars/factoriotools/factorio.svg)](https://hub.docker.com/r/factoriotools/factorio/)
+# Factorio [![Build Status](https://travis-ci.org/factoriotools/factorio-docker.svg?branch=master)](https://travis-ci.org/factoriotools/factorio-docker) [![](https://images.microbadger.com/badges/version/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio) [![](https://images.microbadger.com/badges/image/factoriotools/factorio.svg)](https://microbadger.com/images/factoriotools/factorio "Get your own image badge on microbadger.com") [![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/)

-* `0.17.40`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
+* `0.17.49`, `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
@ -1,12 +1,59 @@
 #!/bin/bash
-set -eo pipefail
+set -eox pipefail

-if [ -z "$1" ] ; then
-  echo "Usage: ./build.sh \$VERSION"
+if [ -z "$1" ] && [ -n "$CI" ]; then
+  echo "Usage: ./build.sh \$VERSION_SHORT"
+  exit 1
+elif [ "$CI" == "true" ]; then
+  VERSION_SHORT="$1"
 else
-  VERSION="$1"
+  VERSION_SHORT=$(find . -maxdepth 1 -type d | sort | tail -1 | grep -o "[0-9].[0-9]*")
+  EXTRA_TAG=latest
 fi

-cd "$VERSION" || exit
+cd "$VERSION_SHORT" || exit

-docker build . -t "factoriotools/docker_factorio_server:$VERSION"
+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
+  if [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == "$VERSION" ]; then
+    TAGS="$DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
+  elif [ -n "$TRAVIS_BRANCH" ]; then
+    TAGS="$DOCKER_REPO:$TRAVIS_BRANCH"
+  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
+
+if [[ "$(dirname "$(git diff --name-only HEAD^)")" =~ $VERSION_SHORT ]] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ] ||
+  [ "$TRAVIS_BRANCH" == "$VERSION" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ] ||
+  [ "$CI" == "" ]; then
+
+  if [ "$CI" == "true" ]; then
+    echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+  fi
+
+  if [ -n "$TRAVIS_BRANCH" ] && [ "$TRAVIS_BRANCH" != "$VERSION" ] && [ "$TRAVIS_BRANCH" != "master" ]; 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
Author	SHA1	Message	Date
Florian Kinder	62e1a9f266	update to 0.17.49	2019-06-13 17:09:11 +00:00
Florian Kinder	be7ecddb0d	update to 0.17.48	2019-06-11 14:14:13 +00:00
Florian Kinder	43599d0c23	update to 0.17.47	2019-06-07 15:49:12 +00:00
Florian Kinder	6fb4cbc600	update to 0.17.46	2019-06-07 11:19:11 +00:00
Florian Kinder	fe0e8f9b91	update to 0.17.45	2019-05-31 13:14:12 +00:00
Florian Kinder	f76e88cea1	update to 0.17.44	2019-05-30 15:14:11 +00:00
Sandro Jäckel	cbaa20cdea	CI: Do not try to push master	2019-05-25 23:49:55 +02:00
Florian Kinder	b3c134d396	update to 0.17.43	2019-05-24 13:09:12 +00:00
Sandro Jäckel	9bdb79b494	CI: Do not try to push master	2019-05-21 22:37:26 +02:00
Florian Kinder	77d83b4152	update to 0.17.42	2019-05-21 17:09:12 +00:00
Sandro Jäckel	25d4edf14f	CI: Don't push $TRAVIS_BRANCH if it is equal to $VERSIOn Reason behind that is that git tags have $TRAVIS_BRANCH set to the tag name	2019-05-18 14:07:27 +02:00
Sandro Jäckel	e16b111c0b	CI: Tag Docker Image with $VERSION_SHORT on git tag building	2019-05-18 14:01:22 +02:00
Sandro Jäckel	09e1ad2045	CI: another try to fix tag building	2019-05-18 13:40:25 +02:00
Sandro Jäckel	2efa39084f	Cache shields.io badges for 10m	2019-05-18 13:37:51 +02:00
Sandro Jäckel	77edb05109	CI: try fix tag building, fix upload, add easy manual pushing, more fixes	2019-05-18 13:26:04 +02:00
Sandro Jäckel	2eea2a25e4	CI: correct docker hub repo name	2019-05-17 19:57:33 +02:00
Sandro Jäckel	98ea8a27c1	Fix sha1 of 0.17.41 Closes #261	2019-05-17 19:45:29 +02:00
Florian Kinder	956af65a2b	update to 0.17.41	2019-05-17 11:19:10 +00:00
Jason	b5c1dff7b4	Allow puid/pgid to be set as environment vars on stable (#256 ) * allow puid/pgid to be set on stable * update docker-entrypoint to include puid, gpid * add quotes to env puid/pgid env vars * add quotes for factorio-vol	2019-05-17 12:32:55 +02:00
Sandro Jäckel	ee5b023911	Quote all vars in Dockerfile (#259 )	2019-05-17 09:11:09 +02:00
Sandro Jäckel	045ef7a214	Skip docker push if it is a PR	2019-05-16 20:19:36 +02:00
Sandro Jäckel	bbc2d42302	Compare $VERSION_SHORT wether we need to push the image	2019-05-16 20:04:24 +02:00
Sandro Jäckel	0173eab54c	Quote factorio volume variable	2019-05-16 19:59:42 +02:00
Sandro Jäckel	f868aa16ad	Follow up to #255	2019-05-16 19:55:43 +02:00
Osiris	5cd0c40975	fix for .tmp.zip saves not being deleted on start (#255 ) Co-Authored-By: Chris Cowan <agentme49@gmail.com>	2019-05-16 19:55:02 +02:00
Sandro Jäckel	778d982c6d	CI: Actually check the entire array	2019-05-16 19:43:44 +02:00
Sandro Jäckel	9d2c38df65	CI: Fix version detection of which image to push, actually push the image	2019-05-16 19:39:50 +02:00
Sandro Jäckel	b2a4195e13	Advance CI features (#245 ) * Build feature branches with branch tag * Build short and long image tag * Add latest and stable tag, made moving repos easier * Only push tags to registry * Only build tags that where changed * Fix if and quoting, push $VERSION_SHORT * Update MicroBadger with Webhook, closes #251 * Quote vars * Set tag on PR, too * Switch to hadolint docker image due to PR not having enviroment variables and I don't want to commit my token in the script * Only push image on master	2019-05-16 19:23:07 +02:00