fix(ci): only update Docker versions when runner has newer version

.github/workflows/github-docker-registry-push.yml

@@ -63,9 +63,49 @@ jobs:
           BRANCH_NAME="docker-versions-update-$(date +%s)"
           git checkout -b "$BRANCH_NAME"
 
-          # Write Docker versions to file
-          echo "- $(docker --version)" > docker-versions.txt
-          echo "- $(docker compose version)" >> docker-versions.txt
+          # Helper: compare two semver strings, return 0 if $1 > $2
+          version_gt() {
+            # Use sort -V to compare versions; if the greater one is $1, it's newer
+            [ "$(printf '%s\n%s' "$1" "$2" | sort -V | tail -n1)" = "$1" ] && [ "$1" != "$2" ]
+          }
+
+          # Save current lines from docker-versions.txt
+          CURRENT_DOCKER_LINE=$(grep "Docker version" docker-versions.txt)
+          CURRENT_COMPOSE_LINE=$(grep "Docker Compose version" docker-versions.txt)
+
+          # Extract semver from current file
+          CURRENT_DOCKER=$(echo "$CURRENT_DOCKER_LINE" | cut -d ' ' -f 4 | cut -d ',' -f 1)
+          CURRENT_COMPOSE=$(echo "$CURRENT_COMPOSE_LINE" | cut -d ' ' -f 5 | tr -d 'v')
+
+          # Get runner versions (full output and semver)
+          RUNNER_DOCKER_FULL="$(docker --version)"
+          RUNNER_COMPOSE_FULL="$(docker compose version)"
+          RUNNER_DOCKER=$(echo "$RUNNER_DOCKER_FULL" | cut -d ' ' -f 3 | cut -d ',' -f 1)
+          RUNNER_COMPOSE=$(echo "$RUNNER_COMPOSE_FULL" | cut -d ' ' -f 4 | tr -d 'v')
+
+          echo "Current: Docker $CURRENT_DOCKER, Compose $CURRENT_COMPOSE"
+          echo "Runner:  Docker $RUNNER_DOCKER, Compose $RUNNER_COMPOSE"
+
+          # Only update if runner version is strictly newer, otherwise keep existing line
+          if version_gt "$RUNNER_DOCKER" "$CURRENT_DOCKER"; then
+            echo "Docker version $RUNNER_DOCKER is newer than $CURRENT_DOCKER, updating"
+            DOCKER_LINE="- $RUNNER_DOCKER_FULL"
+          else
+            echo "Docker version $RUNNER_DOCKER is not newer than $CURRENT_DOCKER, keeping current"
+            DOCKER_LINE="$CURRENT_DOCKER_LINE"
+          fi
+
+          if version_gt "$RUNNER_COMPOSE" "$CURRENT_COMPOSE"; then
+            echo "Docker Compose version $RUNNER_COMPOSE is newer than $CURRENT_COMPOSE, updating"
+            COMPOSE_LINE="- $RUNNER_COMPOSE_FULL"
+          else
+            echo "Docker Compose version $RUNNER_COMPOSE is not newer than $CURRENT_COMPOSE, keeping current"
+            COMPOSE_LINE="$CURRENT_COMPOSE_LINE"
+          fi
+
+          # Write versions to file
+          echo "$DOCKER_LINE" > docker-versions.txt
+          echo "$COMPOSE_LINE" >> docker-versions.txt
 
           # Only add the specific file we want
           git add docker-versions.txt

updatecli/scripts/docker-compose-version.sh

@@ -7,5 +7,22 @@ file_content=$(cat docker-versions.txt)
 # Then, use cut to split the line by spaces and get the 5th field (the version)
 docker_compose_version=$(echo "$file_content" | grep -- "- Docker Compose version" | cut -d ' ' -f 5)
 
-# Print the Docker Compose version
-echo $docker_compose_version
+# Get the current version from README.md (strip leading 'v' if present for comparison)
+current_version=$(grep -oP 'Docker Compose version `\K[^`]+' README.md | head -n1)
+
+# Strip leading 'v' for comparison (updatecli trimprefix transformer handles the output)
+new_clean=$(echo "$docker_compose_version" | sed 's/^v//')
+current_clean=$(echo "$current_version" | sed 's/^v//')
+
+# Compare versions: only output the new version if it's strictly newer
+if [ -n "$current_clean" ] && [ -n "$new_clean" ]; then
+  newer=$(printf '%s\n%s' "$new_clean" "$current_clean" | sort -V | tail -n1)
+  if [ "$newer" = "$current_clean" ] || [ "$new_clean" = "$current_clean" ]; then
+    # Current version is same or newer, output it unchanged to avoid a downgrade
+    echo "v${current_clean}"
+    exit 0
+  fi
+fi
+
+# Print the Docker Compose version (new or when no current version found)
+echo "$docker_compose_version"

updatecli/scripts/docker-version.sh

@@ -10,5 +10,18 @@ docker_version=$(echo "$file_content" | grep -- "- Docker version" | cut -d ' '
 # Cut the version string at the comma to get only the semver part
 docker_version=$(echo "$docker_version" | cut -d ',' -f 1)
 
-# Print the Docker version
-echo $docker_version
+# Get the current version from README.md
+current_version=$(grep -oP 'Docker version `\K[^`]+' README.md | head -n1)
+
+# Compare versions: only output the new version if it's strictly newer
+if [ -n "$current_version" ] && [ -n "$docker_version" ]; then
+  newer=$(printf '%s\n%s' "$docker_version" "$current_version" | sort -V | tail -n1)
+  if [ "$newer" = "$current_version" ] || [ "$docker_version" = "$current_version" ]; then
+    # Current version is same or newer, output it unchanged to avoid a downgrade
+    echo "$current_version"
+    exit 0
+  fi
+fi
+
+# Print the Docker version (new or when no current version found)
+echo "$docker_version"