Combine stages for faster pipeline

Closes #295

.travis.yml

@@ -3,6 +3,7 @@ sudo: required
 language: bash
 services: 
   - docker
+
 addons:
   apt:
     packages:
@@ -14,10 +15,10 @@ jobs:
       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
-      # set EXTRA_TAG to latest,stable when no more experimental versions for 0.17 come out
-      env: VERSION_SHORT=0.17 EXTRA_TAG=latest
+      stage: Build & update Docker HUB description
+      env: VERSION_SHORT=0.17 EXTRA_TAG=latest STABLE=0.17.79
       script:
         - ./build.sh $VERSION_SHORT
     - <<: *build
@@ -26,3 +27,5 @@ jobs:
       env: VERSION_SHORT=0.15
     - <<: *build
       env: VERSION_SHORT=0.14
+    - if: branch = master
+      script: docker run -v $PWD:/workspace -e DOCKERHUB_USERNAME=$DOCKER_USERNAME -e DOCKERHUB_PASSWORD=$DOCKER_PASSWORD -e DOCKERHUB_REPOSITORY='factoriotools/factorio' -e README_FILEPATH='/workspace/README.md' peterevans/dockerhub-description:2.1.0

0.17/Dockerfile

@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.17.73 \
-    SHA1=4d25372b08ea06b0265bdec3a02e55ea7892d5de \
+    VERSION=0.17.79 \
+    SHA1=7f127baf3cf01c6e545a9ca376dec1ac37468f8a \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \

0.17/files/update-mods.sh

@@ -58,7 +58,7 @@ update_mod()
 
   if [[ $HTTP_STATUS != 200 ]]; then
     print_failure "  Download failed: Code $HTTP_STATUS."
-    rm "$MOD_DIR/$MOD_FILENAME"
+    rm -f "$MOD_DIR/$MOD_FILENAME"
     return 1
   fi
 
@@ -69,7 +69,7 @@ update_mod()
 
   if ! [[ $(sha1sum "$MOD_DIR/$MOD_FILENAME") =~ $MOD_SHA1 ]]; then
     print_failure "  SHA1 mismatch!"
-    rm "$MOD_DIR/$MOD_FILENAME"
+    rm -f "$MOD_DIR/$MOD_FILENAME"
     return 1
   fi
 
@@ -78,7 +78,7 @@ update_mod()
   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"
+      rm -f "$file"
     fi
   done
 

README.md

@@ -1,7 +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.73`, `0.17`, `latest` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
-* `0.17.73` `stable` [(0.17/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.17/Dockerfile)
+* `0.17.79`, `0.17`, `latest`, `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)

build.sh

@@ -38,9 +38,13 @@ else
   if [[ -n ${EXTRA_TAG:-} ]]; then
     IFS=","
     for TAG in $EXTRA_TAG; do
-      TAGS+=" -t $DOCKER_REPO:$EXTRA_TAG"
+      TAGS+=" -t $DOCKER_REPO:$TAG"
     done
   fi
+
+  if [[ ${STABLE:-} == "$VERSION" ]]; then
+    TAGS+=" -t $DOCKER_REPO:stable"
+  fi
 fi
 
 # shellcheck disable=SC2068
@@ -53,9 +57,9 @@ 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 == "" ]] ||
+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 == "" ]] ||
+  [[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ ${TRAVIS_PULL_REQUEST_BRANCH:-} == "" ]] ||
   # we are not in CI
   [[ -z ${CI:-} ]]; then
 
@@ -85,5 +89,9 @@ if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRA
     done
   fi
 
+  if [[ ${STABLE:-} == "$VERSION" ]]; then
+    docker push "$DOCKER_REPO:stable"
+  fi
+
   curl -X POST https://hooks.microbadger.com/images/factoriotools/factorio/TmmKGNp8jKcFqZvcJhTCIAJVluw=
 fi