🎨

Took 3 minutes

.github/dependabot.yml

@@ -1,7 +1,11 @@
 version: 2
 updates:
-- package-ecosystem: docker
-  directory: "/docker"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: docker
+    directory: "/docker"
+    schedule:
+      interval: "daily"

.github/workflows/docker-build.yml

@@ -4,19 +4,26 @@ on:
   push:
     branches:
       - master
+    paths:
+      - buildinfo.json
+  # workaround for #526
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+
       - name: build and push
         if: ${{ env.DOCKER_USERNAME != '' && env.DOCKER_PASSWORD != '' }}
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         run: |
-          ./build.py --push-tags --multiarch
+          ./build.py --push-tags --multiarch

.github/workflows/docker-description.yml

@@ -4,15 +4,20 @@ on:
   push:
     branches:
       - master
+    paths:
+      - README.md
+  # workaround for #526
+  workflow_dispatch:
 
 jobs:
   docker-description:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
       - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v2.4.1
+        uses: peter-evans/dockerhub-description@v4.0.0
         if: ${{ env.DOCKER_USERNAME != '' && env.DOCKER_PASSWORD != '' }}
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/docker.yml

@@ -1,22 +0,0 @@
-name: Docker build
-
-on:
-  pull_request:
-  push:
-    tags:
-      - latest
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: build
-        env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        run: |
-          ./build.py --multiarch

.github/workflows/lint.yml

@@ -10,7 +10,9 @@ jobs:
   shellcheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: shellcheck
         uses: reviewdog/action-shellcheck@v1
         with:
@@ -20,7 +22,9 @@ jobs:
   hadolint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: hadolint
         uses: reviewdog/action-hadolint@v1
         with:

.github/workflows/update.yml

@@ -4,18 +4,15 @@ on:
   schedule:
     - cron: "0 * * * *"
   workflow_dispatch:
-    inputs:
-      desc:
-        description: "desc"
-        required: false
 
 jobs:
-  build:
+  check:
     runs-on: ubuntu-latest
     if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'factoriotools/factorio-docker')
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.REPO_TOKEN }}
 

README.md

@@ -6,7 +6,9 @@
 [中文](./README_zh_CN.md)
 
 <!-- start autogeneration tags -->
-* `1`, `1.1`, `1.1.110`, `latest`, `stable`, `stable-1.1.110`
+* `2.0.14`, `latest`
+* `2`, `2.0`, `2.0.13`, `stable`, `stable-2.0.13`
+* `1`, `1.1`, `1.1.110`, `stable-1.1.110`
 * `1.0`, `1.0.0`
 * `0.17`, `0.17.79`
 * `0.16`, `0.16.51`
@@ -259,18 +261,20 @@ The `server-settings.json` file may then contain the variable references like th
 
 These are the environment variables which can be specified at container run time.
 
-| Variable Name | Description | Default | Available in |
-| - | - | - | - |
-| GENERATE_NEW_SAVE | Generate a new save if one does not exist before starting the server  | false | 0.17+ |
-| LOAD_LATEST_SAVE | Load latest when true. Otherwise load SAVE_NAME | true | 0.17+ |
-| PORT | UDP port the server listens on | 34197 | 0.15+ |
-| BIND | IP address (v4 or v6) the server listens on (IP\[:PORT]) | | 0.15+ |
-| RCON_PORT | TCP port the rcon server listens on | 27015 | 0.15+ |
-| SAVE_NAME | Name to use for the save file | _autosave1 | 0.17+ |
-| TOKEN | factorio.com token | | 0.17+ |
-| UPDATE_MODS_ON_START | If mods should be updated before starting the server | | 0.17+ |
-| USERNAME | factorio.com username | | 0.17+ | |
-| CONSOLE_LOG_LOCATION | Saves the console log to the specifies location | |
+| Variable Name        | Description                                                          | Default        | Available in |
+|----------------------|----------------------------------------------------------------------|----------------|--------------|
+| GENERATE_NEW_SAVE    | Generate a new save if one does not exist before starting the server | false          | 0.17+        |
+| LOAD_LATEST_SAVE     | Load latest when true. Otherwise load SAVE_NAME                      | true           | 0.17+        |
+| PORT                 | UDP port the server listens on                                       | 34197          | 0.15+        |
+| BIND                 | IP address (v4 or v6) the server listens on (IP\[:PORT])             |                | 0.15+        |
+| RCON_PORT            | TCP port the rcon server listens on                                  | 27015          | 0.15+        |
+| SAVE_NAME            | Name to use for the save file                                        | _autosave1     | 0.17+        |
+| TOKEN                | factorio.com token                                                   |                | 0.17+        |
+| UPDATE_MODS_ON_START | If mods should be updated before starting the server                 |                | 0.17+        |
+| USERNAME             | factorio.com username                                                |                | 0.17+        |
+| CONSOLE_LOG_LOCATION | Saves the console log to the specifies location                      |                |              |
+| DLC_SPACE_AGE        | Enables or disables the mods for DLC Space Age in mod-list.json[^1]  | true           | 2.0.8+       |
+| MODS                 | Mod directory to use                                                 | /factorio/mods | 2.0.8+       |
 
 **Note:** All environment variables are compared as strings
 
@@ -428,3 +432,8 @@ Use the `PORT` environment variable to start the server on the a different port,
 * [bplein](https://github.com/bplein/docker_factorio_server) - Coded scenario support
 * [jaredledvina](https://github.com/jaredledvina/docker_factorio_server) - Contributed version updates
 * [carlbennett](https://github.com/carlbennett) - Contributed version updates and bugfixes
+
+[^1]: Space Age mods can also be individually enabled by using their name separated by space.  
+  Example 1: Enable all by using `true`
+  Example 2: Enable all by listing the mod names `space-age elevated-rails quality`  
+  Example 3: Enable only Elevated rails `elevated-rails`

README_zh_CN.md

@@ -10,7 +10,7 @@
 * `0.x.y` - 具体的版本
 * `0.x-z` - 在该版本上的增量更新
 
-## 什么是 Facotrio？
+## 什么是 Factorio？
 
 > 摘录自 [steam factorio 页面](https://store.steampowered.com/app/427520/Factorio/)
 

build.py

@@ -92,7 +92,7 @@ def main(push_tags=False, multiarch=False):
     if push_tags:
         login()
 
-    for version, buildinfo in builddata.items():
+    for version, buildinfo in sorted(builddata.items(), key=lambda item: item[0], reverse=True):
         sha256 = buildinfo["sha256"]
         tags = buildinfo["tags"]
         build_and_push(sha256, version, tags, push_tags, multiarch)

buildinfo.json

@@ -51,12 +51,27 @@
   "1.1.110": {
     "sha256": "485fe6db36e5decd7dd0d70e7c97e61f818100fa3e48d87884b287027c7a646a",
     "tags": [
-      "latest",
-      "stable",
       "stable-1.1.110",
       "1",
       "1.1",
       "1.1.110"
     ]
+  },
+  "2.0.13": {
+    "sha256": "27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1",
+    "tags": [
+      "stable",
+      "stable-2.0.13",
+      "2",
+      "2.0",
+      "2.0.13"
+    ]
+  },
+  "2.0.14": {
+    "sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815",
+    "tags": [
+      "latest",
+      "2.0.14"
+    ]
   }
 }

docker/Dockerfile

@@ -16,19 +16,11 @@ ARG BOX64_VERSION=v0.2.4
 # space-exploration
 ARG PRESET
 
-# version checksum of the archive to download
-ARG VERSION
-ARG SHA256
-
-LABEL factorio.version=${VERSION}
-
 # number of retries that curl will use when pulling the headless server tarball
 ARG CURL_RETRIES=8
 
 ENV PORT=34197 \
     RCON_PORT=27015 \
-    VERSION=${VERSION} \
-    SHA256=${SHA256} \
     SAVES=/factorio/saves \
     PRESET="$PRESET" \
     CONFIG=/factorio/config \
@@ -36,9 +28,35 @@ ENV PORT=34197 \
     SCENARIOS=/factorio/scenarios \
     SCRIPTOUTPUT=/factorio/script-output \
     PUID="$PUID" \
-    PGID="$PGID"
+    PGID="$PGID" \
+    DLC_SPACE_AGE="true"
 
 SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
+
+RUN apt-get -q update \
+    && DEBIAN_FRONTEND=noninteractive apt-get -qy install ca-certificates curl jq pwgen xz-utils procps gettext-base --no-install-recommends \
+    && if [[ "$(uname -m)" == "aarch64" ]]; then \
+        echo "installing ARM compatability layer" \
+        && DEBIAN_FRONTEND=noninteractive apt-get -qy install unzip --no-install-recommends \ 
+        && curl -LO https://github.com/ptitSeb/box64/releases/download/${BOX64_VERSION}/box64-GENERIC_ARM-RelWithDebInfo.zip \
+        && unzip box64-GENERIC_ARM-RelWithDebInfo.zip -d /bin \
+        && rm -f box64-GENERIC_ARM-RelWithDebInfo.zip \
+        && chmod +x /bin/box64; \
+    fi \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN addgroup --system --gid "$PGID" "$GROUP" \
+    && adduser --system --uid "$PUID" --gid "$PGID" --no-create-home --disabled-password --shell /bin/sh "$USER"
+
+# version checksum of the archive to download
+ARG VERSION
+ARG SHA256
+
+LABEL factorio.version=${VERSION}
+
+ENV VERSION=${VERSION} \
+    SHA256=${SHA256}
+
 RUN set -ox pipefail \
     && if [[ "${VERSION}" == "" ]]; then \
         echo "build-arg VERSION is required" \
@@ -50,28 +68,15 @@ RUN set -ox pipefail \
     fi \
     && archive="/tmp/factorio_headless_x64_$VERSION.tar.xz" \
     && mkdir -p /opt /factorio \
-    && apt-get -q update \
-    && DEBIAN_FRONTEND=noninteractive apt-get -qy install ca-certificates curl jq pwgen xz-utils procps gettext-base --no-install-recommends \
-    && curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" -o "$archive" --retry $CURL_RETRIES\
+    && curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" -o "$archive" --retry $CURL_RETRIES \
     && echo "$SHA256  $archive" | sha256sum -c \
     || (sha256sum "$archive" && file "$archive" && exit 1) \
     && tar xf "$archive" --directory /opt \
     && chmod ugo=rwx /opt/factorio \
     && rm "$archive" \
-    && if [[ "$(uname -m)" == "aarch64" ]]; then \
-        echo "installing ARM compatability layer" \
-        && DEBIAN_FRONTEND=noninteractive apt-get -qy install unzip --no-install-recommends \ 
-        && curl -LO https://github.com/ptitSeb/box64/releases/download/${BOX64_VERSION}/box64-GENERIC_ARM-RelWithDebInfo.zip \
-        && unzip box64-GENERIC_ARM-RelWithDebInfo.zip -d /bin \
-        && rm -f box64-GENERIC_ARM-RelWithDebInfo.zip \
-        && chmod +x /bin/box64; \
-    fi \
-    && rm -rf /var/lib/apt/lists/* \
     && ln -s "$SCENARIOS" /opt/factorio/scenarios \
     && ln -s "$SAVES" /opt/factorio/saves \
     && mkdir -p /opt/factorio/config/ \
-    && addgroup --system --gid "$PGID" "$GROUP" \
-    && adduser --system --uid "$PUID" --gid "$PGID" --no-create-home --disabled-password --shell /bin/sh "$USER" \
     && chown -R "$USER":"$GROUP" /opt/factorio /factorio
 
 COPY files/*.sh /

docker/docker-compose.yml

@@ -6,8 +6,8 @@ services:
       args:
         # Check buildinfo.json for supported versions and SHAs
         # https://github.com/factoriotools/factorio-docker/blob/master/buildinfo.json
-        - VERSION=1.1.110
-        - SHA256=485fe6db36e5decd7dd0d70e7c97e61f818100fa3e48d87884b287027c7a646a
+        - VERSION=2.0.13
+        - SHA256=27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1
     ports:
       - "34197:34197/udp"
       - "27015:27015/tcp"
@@ -22,3 +22,8 @@ services:
 #      - PORT=34198
 #      - PRESET=deathworld
 #      - ADDR=::1
+
+#    # Uncomment the following line to enable the use of the host's network stack,
+#    # which may be necessary for some setups like NAS or when using some proxy service like firewall rules.
+#    extra_hosts:
+#      - "host.docker.internal:host-gateway"

docker/files/docker-dlc.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+set -eou pipefail
+
+# Path to the mod-list.json file
+MOD_LIST_FILE="$MODS/mod-list.json"
+
+ALL_SPACE_AGE_MODS=("elevated-rails" "quality" "space-age")
+
+if [[ ! -f "$MOD_LIST_FILE" ]]; then
+  # Create the mod-list.json file if it doesn't exist
+  echo '{"mods":[{"name":"base","enabled":true}]}' > "$MOD_LIST_FILE"
+fi
+
+enable_mod()
+{
+  echo "Enable mod $1 for DLC"
+  jq --arg mod_name "$1" 'if .mods | map(.name) | index($mod_name) then .mods |= map(if .name == $mod_name and .enabled == false then .enabled = true else . end) else . end' "$MOD_LIST_FILE" > "$MOD_LIST_FILE.tmp"
+  mv "$MOD_LIST_FILE.tmp" "$MOD_LIST_FILE"
+}
+
+disable_mod()
+{
+  echo "Disable mod $1 for DLC"
+  jq --arg mod_name "$1" 'if .mods | map(.name) | index($mod_name) then .mods |= map(if .name == $mod_name and .enabled == true then .enabled = false else . end) else .mods += [{"name": $mod_name, "enabled": false}] end' "$MOD_LIST_FILE" > "$MOD_LIST_FILE.tmp"
+  mv "$MOD_LIST_FILE.tmp" "$MOD_LIST_FILE"
+}
+
+# Enable or disable DLCs if configured
+if [[ ${DLC_SPACE_AGE:-} == "true" ]]; then
+  # Define the DLC mods
+  ENABLE_MODS=(${ALL_SPACE_AGE_MODS[@]})
+elif [[ ${DLC_SPACE_AGE:-} == "false" ]]; then
+  # Define the DLC mods
+  DISABLE_MODS=(${ALL_SPACE_AGE_MODS[@]})
+else
+  ENABLE_MODS=()
+  DISABLE_MODS=()
+
+  for SPACE_AGE_MOD in "${ALL_SPACE_AGE_MODS[@]}"; do
+    REGEX="(^|\s)$SPACE_AGE_MOD($|\s)"
+    if [[ "$DLC_SPACE_AGE" =~ $REGEX ]]; then
+      ENABLE_MODS+=($SPACE_AGE_MOD)
+    else
+      DISABLE_MODS+=($SPACE_AGE_MOD)
+    fi
+  done
+fi
+
+# Iterate over each DLC mod to enable
+for MOD in "${ENABLE_MODS[@]}"; do
+  enable_mod "$MOD"
+done
+
+# Iterate over each DLC mod to disable
+for MOD in "${DISABLE_MODS[@]}"; do
+  disable_mod "$MOD"
+done

docker/files/docker-entrypoint.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eoux pipefail
+INSTALLED_DIRECTORY=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 FACTORIO_VOL=/factorio
 LOAD_LATEST_SAVE="${LOAD_LATEST_SAVE:-true}"
 GENERATE_NEW_SAVE="${GENERATE_NEW_SAVE:-false}"
@@ -40,11 +41,13 @@ if [[ $NRTMPSAVES -gt 0 ]]; then
 fi
 
 if [[ ${UPDATE_MODS_ON_START:-} == "true" ]]; then
-  ./docker-update-mods.sh
+  ${INSTALLED_DIRECTORY}/docker-update-mods.sh
 fi
 
+${INSTALLED_DIRECTORY}/docker-dlc.sh
+
 EXEC=""
-if [[ $(id -u) = 0 ]]; then
+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
@@ -100,6 +103,7 @@ FLAGS=(\
   --server-adminlist "$CONFIG/server-adminlist.json" \
   --rcon-password "$(cat "$CONFIG/rconpw")" \
   --server-id /factorio/config/server-id.json \
+  --mod-directory "$MODS" \
 )
 
 if [ -n "$CONSOLE_LOG_LOCATION" ]; then

docker/files/update-mods.sh

@@ -28,7 +28,7 @@ update_mod()
   MOD_NAME="$1"
   MOD_NAME_ENCODED="${1// /%20}"
 
-  print_step "Checking for update of mod $MOD_NAME..."
+  print_step "Checking for update of mod $MOD_NAME for factorio $FACTORIO_VERSION ..."
 
   MOD_INFO_URL="$MOD_BASE_URL/api/mods/$MOD_NAME_ENCODED"
   MOD_INFO_JSON=$(curl --silent "$MOD_INFO_URL")
@@ -54,7 +54,7 @@ update_mod()
     return 0
   fi
 
-  print_step "Downloading..."
+  print_step "  Downloading $MOD_FILENAME"
   FULL_URL="$MOD_BASE_URL$MOD_URL?username=$USERNAME&token=$TOKEN"
   HTTP_STATUS=$(curl --silent -L -w "%{http_code}" -o "$MOD_DIR/$MOD_FILENAME" "$FULL_URL")
 

update.sh

@@ -4,12 +4,16 @@ SEMVER_REGEX="^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
 
 stable_online_version=$(curl 'https://factorio.com/api/latest-releases' | jq '.stable.headless' -r)
 experimental_online_version=$(curl 'https://factorio.com/api/latest-releases' | jq '.experimental.headless' -r)
-stable_sha256=$(curl "https://factorio.com/download/sha256sums/" | grep "factorio_headless_x64_${stable_online_version}.tar.xz" | awk '{print $1}')
-experimental_sha256=$(curl "https://factorio.com/download/sha256sums/" | grep "factorio_headless_x64_${experimental_online_version}.tar.xz" | awk '{print $1}')
-stable_current_version=$(jq 'with_entries(select(contains({value:{tags:["stable"]}}))) | keys | .[0]' buildinfo.json -r)
-latest_current_version=$(jq 'with_entries(select(contains({value:{tags:["latest"]}}))) | keys | .[0]' buildinfo.json -r)
+
+stable_sha256=$(curl "https://factorio.com/download/sha256sums/" | grep -E "(factorio_headless_x64_|factorio-headless_linux_)${stable_online_version}.tar.xz" | awk '{print $1}')
+experimental_sha256=$(curl "https://factorio.com/download/sha256sums/" | grep -E "(factorio_headless_x64_|factorio-headless_linux_)${experimental_online_version}.tar.xz" | awk '{print $1}')
+
+stable_current_version=$(jq 'with_entries(select(.value.tags | index("stable"))) | keys | .[0]' buildinfo.json -r)
+latest_current_version=$(jq 'with_entries(select(.value.tags | index("latest"))) | keys | .[0]' buildinfo.json -r)
+
 echo "stable_online_version=${stable_online_version} experimental_online_version=${experimental_online_version}"
 echo "stable_current_version=${stable_current_version} latest_current_version=${latest_current_version}"
+
 if [[ -z "${stable_online_version}" ]] || [[ -z "${experimental_online_version}" ]]; then
     exit
 fi
@@ -57,6 +61,11 @@ echo "stableCurrentVersionShort=${stableCurrentVersionShort} latestCurrentVersio
 
 tmpfile=$(mktemp)
 
+# Remove stable tag
+cp buildinfo.json "$tmpfile"
+jq --arg stable_current_version "$stable_current_version" 'with_entries(if .key == $stable_current_version then .value.tags |= . - ["stable"] else . end)' "$tmpfile" > buildinfo.json
+rm -f -- "$tmpfile"
+
 # Remove latest tag
 cp buildinfo.json "$tmpfile"
 jq --arg latest_current_version "$latest_current_version" 'with_entries(if .key == $latest_current_version then .value.tags |= . - ["latest"] else . end)' "$tmpfile" > buildinfo.json
@@ -64,8 +73,8 @@ rm -f -- "$tmpfile"
 
 # Update tag by stable
 cp buildinfo.json "$tmpfile"
-if [[ $stableOnlineVersionShort == "$stableCurrentVersionShort" ]]; then
-    jq --arg stable_current_version "$stable_current_version" --arg stable_online_version "$stable_online_version" --arg sha256 "$stable_sha256" 'with_entries(if .key == $stable_current_version then .key |= $stable_online_version | .value.sha256 |= $sha256 | .value.tags |= . - [$stable_current_version] + [$stable_online_version] else . end)' "$tmpfile" > buildinfo.json
+if [[ "$stable_online_version" == "$stable_current_version" ]]; then
+    jq --arg stable_current_version "$stable_current_version" --arg stable_online_version "$stable_online_version" --arg sha256 "$stable_sha256" 'with_entries(if .key == $stable_current_version then .key |= $stable_online_version | .value.sha256 |= $sha256 | .value.tags |= . - [$stable_current_version] + [$stable_online_version, "stable"] else . end)' "$tmpfile" > buildinfo.json
 else
     jq --arg stable_current_version "$stable_current_version" --arg stable_online_version "$stable_online_version" --arg sha256 "$stable_sha256" --arg stableOnlineVersionShort "$stableOnlineVersionShort" --arg stableOnlineVersionMajor "$stableOnlineVersionMajor" 'with_entries(if .key == $stable_current_version then .value.tags |= . - ["latest","stable",$stableOnlineVersionMajor] else . end) | to_entries | . + [{ key: $stable_online_version, value: { sha256: $sha256, tags: ["latest","stable",("stable-" + $stable_online_version),$stableOnlineVersionMajor,$stableOnlineVersionShort,$stable_online_version]}}] | from_entries' "$tmpfile" > buildinfo.json
 fi