Fixed tag match in update

Took 38 minutes

.github/workflows/docker-build.yml

@@ -6,6 +6,7 @@ on:
       - master
     tags:
       - latest
+  pull_request:
 
 jobs:
   build:

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`, `2.0`, `2.0.8`, `latest`, `stable`, `stable-2.0.8`
+* `2`, `2.0`, `2.0.7`, `stable`, `stable-2.0.7`
 * `1`, `1.1`, `1.1.110`, `stable-1.1.110`
 * `1.0`, `1.0.0`
 * `0.17`, `0.17.79`
@@ -260,20 +261,18 @@ 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                      |                |              |
-| DLC_SPACE_AGE        | Enables or disables the mods for DLC Space Age in mod-list.json      | true           | 2.0.8+       |
-| MODS                 | Mod directory to use                                                 | /factorio/mods | 2.0.8+       |
+| 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 | |
 
 **Note:** All environment variables are compared as strings
 

buildinfo.json

@@ -57,15 +57,15 @@
       "1.1.110"
     ]
   },
-  "2.0.9": {
-    "sha256": "f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d",
+  "2.0.8": {
+    "sha256": "d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca",
     "tags": [
       "latest",
       "stable",
-      "stable-2.0.9",
+      "stable-2.0.8",
       "2",
       "2.0",
-      "2.0.9"
+      "2.0.8"
     ]
   }
 }

docker/Dockerfile

@@ -28,8 +28,7 @@ ENV PORT=34197 \
     SCENARIOS=/factorio/scenarios \
     SCRIPTOUTPUT=/factorio/script-output \
     PUID="$PUID" \
-    PGID="$PGID" \
-    DLC_SPACE_AGE="true"
+    PGID="$PGID"
 
 SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
 

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.8
+        - SHA256=d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca
     ports:
       - "34197:34197/udp"
       - "27015:27015/tcp"

docker/files/docker-dlc.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-set -eou pipefail
-
-# Path to the mod-list.json file
-MOD_LIST_FILE="$MODS/mod-list.json"
-
-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
-  DLC_MODS=("elevated-rails" "quality" "space-age")
-
-  # Iterate over each DLC mod
-  for MOD in "${DLC_MODS[@]}"; do
-    enable_mod "$MOD"
-  done
-else
-  # Define the DLC mods
-  DLC_MODS=("elevated-rails" "quality" "space-age")
-
-  # Iterate over each DLC mod
-  for MOD in "${DLC_MODS[@]}"; do
-    disable_mod "$MOD"
-  done
-fi

docker/files/docker-entrypoint.sh

@@ -43,10 +43,8 @@ if [[ ${UPDATE_MODS_ON_START:-} == "true" ]]; then
   ./docker-update-mods.sh
 fi
 
-./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
@@ -102,7 +100,6 @@ 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 for factorio $FACTORIO_VERSION ..."
+  print_step "Checking for update of mod $MOD_NAME..."
 
   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 $MOD_FILENAME"
+  print_step "Downloading..."
   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")