CI: simplify logic

CI: Also disable docker push for branches
Update all base images to alpine 3.11
2025-07-01 14:38:05 +02:00 · 2020-05-18 02:43:06 +02:00 · 2020-05-18 02:42:55 +02:00 · 2020-05-18 02:42:35 +02:00 · 2020-05-18 02:36:26 +02:00 · 2020-05-18 02:34:53 +02:00
6 changed files with 29 additions and 19 deletions
--- a/0.14/Dockerfile
+++ b/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"

--- a/0.15/Dockerfile
+++ b/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"

--- a/0.16/Dockerfile
+++ b/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"

--- a/0.17/Dockerfile
+++ b/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
--- a/0.18/Dockerfile
+++ b/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"

@ -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
--- a/build.sh
+++ b/build.sh
@ -27,8 +27,10 @@ else
    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
-      TAGS="-t $DOCKER_REPO:$TRAVIS_BRANCH"
+    # 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"
    fi
  else
    # we are not in CI and tag version and version short
@ -68,13 +70,15 @@ if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ ${TR
  fi

  # push a tag on a branch other than master
-  if [[ -n ${TRAVIS_BRANCH:-} ]] && [[ $VERSION != "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ ${TRAVIS_BRANCH:-} != "master" ]]; then
-    docker push "$DOCKER_REPO:$TRAVIS_BRANCH"
-  fi
+  # 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:$TRAVIS_BRANCH"
+    docker push "$DOCKER_REPO:$VERSION"
  fi

  if [[ -n ${TRAVIS_TAG:-} ]] || [[ -z ${CI:-} ]]; then
Author	SHA1	Message	Date
Sandro Jäckel	4e261043cd	CI: simplify logic	2020-05-18 02:43:06 +02:00
Sandro Jäckel	4c47dbc4ee	CI: Also disable docker push for branches	2020-05-18 02:42:55 +02:00
Sandro Jäckel	07264e626f	Update all base images to alpine 3.11	2020-05-18 02:42:35 +02:00
Sandro Jäckel	64a1f8d9bf	Replace symlinks with config option write-data Closes #311	2020-05-18 02:36:26 +02:00
Sandro Jäckel	15a2d493f8	apply shellcheck suggestions	2020-05-18 02:34:53 +02:00
Sandro Jäckel	3777041d3e	CI: disable branch tagging to fix dependabot	2020-05-18 02:21:47 +02:00
Simon Schneider	ccd0707d21	update alpine-glibc image to 3.11 (#312 )	2020-05-18 01:25:03 +02:00