ci: Fix incremental push

Closes #311

.travis.yml

@@ -31,4 +31,4 @@ jobs:
     - <<: *build
       if: branch = master AND type != pull_request
       env:
-      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
+      script: DOCKERHUB_USERNAME=$DOCKER_USERNAME DOCKERHUB_PASSWORD=$DOCKER_PASSWORD DOCKERHUB_REPOSITORY='factoriotools/factorio' README_FILEPATH='./README.md' ./update-dockerhub-description.sh

0.14/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 

0.15/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 

0.16/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 

0.17/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 
@@ -19,6 +19,7 @@ ENV PORT=34197 \
     PUID="$PUID" \
     PGID="$PGID"
 
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN set -ox pipefail \
     && archive="/tmp/factorio_headless_x64_$VERSION.tar.xz" \
     && mkdir -p /opt /factorio \
@@ -29,10 +30,12 @@ RUN set -ox pipefail \
     && 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 \
+    && mkdir -p /opt/factorio/config/ \
+    && printf "\
+[path]\n\
+read-data=__PATH__executable__/../../data\n\
+write-data=/factorio\n\
+" >> /opt/factorio/config/config.ini \
     && addgroup -g "$PGID" -S "$GROUP" \
     && adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \
     && chown -R "$USER":"$GROUP" /opt/factorio /factorio

0.17/files/update-mods.sh

@@ -32,19 +32,20 @@ update_mod()
   MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
   MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")
 
+  if ! echo "$MOD_INFO_JSON" | jq -e .name >/dev/null; then
+    print_success "  Custom mod not on $MOD_BASE_URL, skipped."
+    return 0
+  fi
+
   MOD_INFO=$(echo "$MOD_INFO_JSON" | jq -j --arg version "$FACTORIO_VERSION" ".releases|reverse|map(select(.info_json.factorio_version as \$mod_version | \$version | startswith(\$mod_version)))[0]|.file_name, \";\", .download_url, \";\", .sha1")
 
   MOD_FILENAME=$(echo "$MOD_INFO" | cut -f1 -d";")
   MOD_URL=$(echo "$MOD_INFO" | cut -f2 -d";")
   MOD_SHA1=$(echo "$MOD_INFO" | cut -f3 -d";")
 
-  if [[ -z $MOD_URL ]]; then
-    return 1
-  fi
-
   if [[ $MOD_FILENAME == null ]]; then
     print_failure "  Not compatible with version"
-    return 1
+    return 0
   fi
 
   if [[ -f $MOD_DIR/$MOD_FILENAME ]]; then

0.18/Dockerfile

@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:alpine-3.9
+FROM frolvlad/alpine-glibc:alpine-3.11
 
 LABEL maintainer="https://github.com/factoriotools/factorio-docker"
 
@@ -9,8 +9,8 @@ ARG PGID=845
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=0.18.13 \
-    SHA1=1a150af3ca749c2707287ff0c733c00eb999f702 \
+    VERSION=0.18.24 \
+    SHA1=04f9aa9b93eaf220d55447201cb10f96e325e073 \
     SAVES=/factorio/saves \
     CONFIG=/factorio/config \
     MODS=/factorio/mods \
@@ -19,6 +19,7 @@ ENV PORT=34197 \
     PUID="$PUID" \
     PGID="$PGID"
 
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN set -ox pipefail \
     && archive="/tmp/factorio_headless_x64_$VERSION.tar.xz" \
     && mkdir -p /opt /factorio \
@@ -29,10 +30,12 @@ RUN set -ox pipefail \
     && 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 \
+    && mkdir -p /opt/factorio/config/ \
+    && printf "\
+[path]\n\
+read-data=__PATH__executable__/../../data\n\
+write-data=/factorio\n\
+" >> /opt/factorio/config/config.ini \
     && addgroup -g "$PGID" -S "$GROUP" \
     && adduser -u "$PUID" -G "$GROUP" -s /bin/sh -SDH "$USER" \
     && chown -R "$USER":"$GROUP" /opt/factorio /factorio

0.18/files/update-mods.sh

@@ -32,19 +32,20 @@ update_mod()
   MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME"
   MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")
 
+  if ! echo "$MOD_INFO_JSON" | jq -e .name >/dev/null; then
+    print_success "  Custom mod not on $MOD_BASE_URL, skipped."
+    return 0
+  fi
+
   MOD_INFO=$(echo "$MOD_INFO_JSON" | jq -j --arg version "$FACTORIO_VERSION" ".releases|reverse|map(select(.info_json.factorio_version as \$mod_version | \$version | startswith(\$mod_version)))[0]|.file_name, \";\", .download_url, \";\", .sha1")
 
   MOD_FILENAME=$(echo "$MOD_INFO" | cut -f1 -d";")
   MOD_URL=$(echo "$MOD_INFO" | cut -f2 -d";")
   MOD_SHA1=$(echo "$MOD_INFO" | cut -f3 -d";")
 
-  if [[ -z $MOD_URL ]]; then
-    return 1
-  fi
-
   if [[ $MOD_FILENAME == null ]]; then
     print_failure "  Not compatible with version"
-    return 1
+    return 0
   fi
 
   if [[ -f $MOD_DIR/$MOD_FILENAME ]]; then

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.13`, `0.18`, `latest` [(0.18/Dockerfile)](https://github.com/factoriotools/factorio-docker/blob/master/0.18/Dockerfile)
+* `0.18.24`, `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)
@@ -118,22 +118,22 @@ sudo docker run -d \
   -p 34197:34197/udp \
   -p 27015:27015/tcp \
   -v /opt/factorio:/factorio \
-  -e ENABLE_SERVER_LOAD_LATEST=false \
+  -e LOAD_LATEST_SAVE=false \
   -e SAVE_NAME=replaceme \
   --name factorio \
   --restart=always \
   factoriotools/factorio
 ```
 
-To generate a new map set `ENABLE_GENERATE_NEW_MAP_SAVE=true` and specify `SAVE_NAME`:
+To generate a new map set `GENERATE_NEW_SAVE=true` and specify `SAVE_NAME`:
 
 ```shell
 sudo docker run -d \
   -p 34197:34197/udp \
   -p 27015:27015/tcp \
   -v /opt/factorio:/factorio \
-  -e ENABLE_SERVER_LOAD_LATEST=false \
-  -e ENABLE_GENERATE_NEW_MAP_SAVE=true \
+  -e LOAD_LATEST_SAVE=false \
+  -e GENERATE_NEW_SAVE=true \
   -e SAVE_NAME=replaceme \
   --name factorio \
   --restart=always \

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,13 +21,13 @@ 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
-    elif [[ -n $TRAVIS_BRANCH ]]; then
+    # 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
@@ -51,33 +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
-  if [[ -n ${TRAVIS_BRANCH:-} ]] && [[ $VERSION != "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ ${TRAVIS_BRANCH:-} != "master" ]]; then
+  # 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
 
   # push an incremental tag
+  # eg 0.18.24-1
   if [[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]]; then
     docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
   fi
 
-  if [[ -n ${TRAVIS_TAG:-} ]] || [[ -z ${CI:-} ]]; then
+  # 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

update-dockerhub-description.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# This script is licensed under MIT and was originally written by Peter Evans. You can find a copy of the MIT license next to this file.
+# The original file is available on his Github repo under the following link:
+# https://github.com/peter-evans/dockerhub-description/blob/84d38211e27bb9b9effefa718f8c734db8adc5e1/entrypoint.sh
+
+set -euo pipefail
+IFS=$'\n\t'
+
+# Set the default path to README.md
+README_FILEPATH=${README_FILEPATH:="./README.md"}
+
+# Check the file size
+if [[ $(wc -c <${README_FILEPATH}) -gt 25000 ]]; then
+  echo "File size exceeds the maximum allowed 25000 bytes"
+  exit 1
+fi
+
+# Acquire a token for the Docker Hub API
+echo "Acquiring token"
+# shellcheck disable=2089
+LOGIN_PAYLOAD="{\"username\": \"${DOCKERHUB_USERNAME}\", \"password\": \"${DOCKERHUB_PASSWORD}\"}"
+TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d "${LOGIN_PAYLOAD}" https://hub.docker.com/v2/users/login/ | jq -r .token)
+
+# Send a PATCH request to update the description of the repository
+echo "Sending PATCH request"
+REPO_URL="https://hub.docker.com/v2/repositories/${DOCKERHUB_REPOSITORY}/"
+RESPONSE_CODE=$(curl -s --write-out "%{response_code}" --output /dev/null -H "Authorization: JWT ${TOKEN}" -X PATCH --data-urlencode full_description@${README_FILEPATH} "${REPO_URL}")
+echo "Received response code: $RESPONSE_CODE"
+
+if [[ $RESPONSE_CODE -eq 200 ]]; then
+  exit 0
+else
+  exit 1
+fi