🎨

Took 3 minutes

.github/workflows/docker-build.yml

@@ -4,8 +4,10 @@ on:
   push:
     branches:
       - master
-    tags:
-      - latest
+    paths:
+      - buildinfo.json
+  # workaround for #526
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/docker-description.yml

@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - master
+    paths:
+      - README.md
+  # workaround for #526
+  workflow_dispatch:
 
 jobs:
   docker-description:

.github/workflows/update.yml

@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.REPO_TOKEN }}
 
       - name: Run update script
         run: ./update.sh

README.md

@@ -6,7 +6,8 @@
 [中文](./README_zh_CN.md)
 
 <!-- start autogeneration tags -->
-* `2`, `2.0`, `2.0.9`, `latest`, `stable`, `stable-2.0.9`
+* `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`
@@ -272,7 +273,7 @@ These are the environment variables which can be specified at container run time
 | 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      | true           | 2.0.8+       |
+| 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
@@ -431,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/)
 

buildinfo.json

@@ -57,15 +57,21 @@
       "1.1.110"
     ]
   },
-  "2.0.9": {
-    "sha256": "f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d",
+  "2.0.13": {
+    "sha256": "27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1",
     "tags": [
-      "latest",
       "stable",
-      "stable-2.0.9",
+      "stable-2.0.13",
       "2",
       "2.0",
-      "2.0.9"
+      "2.0.13"
+    ]
+  },
+  "2.0.14": {
+    "sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815",
+    "tags": [
+      "latest",
+      "2.0.14"
     ]
   }
 }

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=2.0.9
-        - SHA256=f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d
+        - 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

@@ -4,6 +4,8 @@ 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"
@@ -26,18 +28,30 @@ disable_mod()
 # Enable or disable DLCs if configured
 if [[ ${DLC_SPACE_AGE:-} == "true" ]]; then
   # Define the DLC mods
-  DLC_MODS=("elevated-rails" "quality" "space-age")
-
-  # Iterate over each DLC mod
-  for MOD in "${DLC_MODS[@]}"; do
-    enable_mod "$MOD"
-  done
-else
+  ENABLE_MODS=(${ALL_SPACE_AGE_MODS[@]})
+elif [[ ${DLC_SPACE_AGE:-} == "false" ]]; then
   # Define the DLC mods
-  DLC_MODS=("elevated-rails" "quality" "space-age")
+  DISABLE_MODS=(${ALL_SPACE_AGE_MODS[@]})
+else
+  ENABLE_MODS=()
+  DISABLE_MODS=()
 
-  # Iterate over each DLC mod
-  for MOD in "${DLC_MODS[@]}"; do
-    disable_mod "$MOD"
+  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,10 +41,10 @@ if [[ $NRTMPSAVES -gt 0 ]]; then
 fi
 
 if [[ ${UPDATE_MODS_ON_START:-} == "true" ]]; then
-  ./docker-update-mods.sh
+  ${INSTALLED_DIRECTORY}/docker-update-mods.sh
 fi
 
-./docker-dlc.sh
+${INSTALLED_DIRECTORY}/docker-dlc.sh
 
 EXEC=""
 if [[ $(id -u) == 0 ]]; then

update.sh

@@ -73,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