Update to Factorio 0.18.25

0.18/Dockerfile

@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.18.24 \
-    SHA1=04f9aa9b93eaf220d55447201cb10f96e325e073 \
+    VERSION=0.18.25 \
+    SHA1=5e79abcf4b68afb8896afc2df16a1c8e5b003eeb \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \

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) ![Updater status](https://img.shields.io/endpoint?label=Updater%20status&logo=a&url=https%3A%2F%2Fhealthchecks.supersandro.de%2Fbadge%2F1a0a7698-445d-4e54-9e4b-f61a1544e01f%2FBO8VukOA%2Fmaintainer.shields) [![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.18.24`, `0.18`, `latest` [(0.18/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.18/Dockerfile)
+* `0.18.25`, `0.18`, `latest` [(0.18/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.18/Dockerfile)
 * `0.17.79`, `0.17`, `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)

build.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -eoux pipefail
 
-if [[ -z ${1:-} ]] && [[ -n ${CI:-} ]]; then
+if [[ -z ${1:-} && -n ${CI:-} ]]; then
   echo 'Usage: ./build.sh VERSION_SHORT'
   exit 1
-elif [[ ${CI:-} == true ]] || [[ -n ${1:-} ]]; 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]]*")
@@ -21,16 +21,14 @@ if [[ ${TRAVIS_PULL_REQUEST:-} == true ]]; then
 else
   if [[ -n ${CI:-} ]]; then
     # we are either on master or on a tag build
-    if [[ $TRAVIS_BRANCH == master ]] || [[ $TRAVIS_BRANCH == "$VERSION" ]]; then
+    if [[ ${TRAVIS_BRANCH:-} == master || ${TRAVIS_BRANCH:-} == "$VERSION" ]]; then
       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="-t $DOCKER_REPO:$TRAVIS_BRANCH -t $DOCKER_REPO:$VERSION -t $DOCKER_REPO:$VERSION_SHORT"
-    # we build a other branch than master
-    # disabled for now cause it breaks Travis CI builds of dependabot
-    # https://travis-ci.org/github/factoriotools/factorio-docker/jobs/688176474#L182
-    # elif [[ -n $TRAVIS_BRANCH ]]; then
-    #   TAGS="-t $DOCKER_REPO:$TRAVIS_BRANCH"
+    # we build a other branch than master and exclude dependabot branches from tags cause the / is not supported by docker
+    elif [[ -n ${TRAVIS_BRANCH:-} && ! $TRAVIS_BRANCH =~ "/" ]]; then
+      TAGS="-t $DOCKER_REPO:$TRAVIS_BRANCH"
     fi
   else
     # we are not in CI and tag version and version short
@@ -53,35 +51,35 @@ fi
 eval docker build . ${TAGS[@]}
 docker images
 
+# remove -1 from incremental tag
+# eg before: 0.18.24-1, after 0.18.24
 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_VERSION:-}" ]] && [[ ${TRAVIS_PULL_REQUEST_BRANCH:-} == "" ]] ||
-  # we are not in CI
+# or we build a tag and we don't build a PR
+if [[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" && ${TRAVIS_PULL_REQUEST_BRANCH:-} == "" ]] ||
+  # or we are not in CI
   [[ -z ${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
-  # disabled for now cause it breaks Travis CI builds of dependabot
-  # https://travis-ci.org/github/factoriotools/factorio-docker/jobs/688176474#L182
-  #  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_VERSION:-}" ]]; then
-    docker push "$DOCKER_REPO:$VERSION"
+  # push a tag on a branch other than master except dependabot branches cause docker does not support /
+  if [[ -n ${TRAVIS_BRANCH:-} && $VERSION != "${TRAVIS_BRANCH_VERSION:-}" && ${TRAVIS_BRANCH:-} != "master" && ! ${TRAVIS_BRANCH:-} =~ "/" ]]; then
+    docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
   fi
 
-  if [[ -n ${TRAVIS_TAG:-} ]] || [[ -z ${CI:-} ]]; then
+  # push an incremental tag
+  # eg 0.18.24-1
+  if [[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]]; then
+    docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
+  fi
+
+  # only push on tags or when manually running the script
+  if [[ -n ${TRAVIS_TAG:-} || -z ${CI:-} ]]; then
     docker push "$DOCKER_REPO:$VERSION"
     docker push "$DOCKER_REPO:$VERSION_SHORT"
   fi