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

Prevent back-and-forth version update PRs caused by different GitHub
Actions runners having different Docker/Compose versions installed.
Both the workflow and updatecli scripts now compare versions using
sort -V and only update when the new version is strictly newer.

Author: gounthar

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

@@ -63,9 +63,44 @@ 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" ]
+          }
+
+          # Extract current versions from docker-versions.txt
+          CURRENT_DOCKER=$(grep "Docker version" docker-versions.txt | cut -d ' ' -f 4 | cut -d ',' -f 1)
+          CURRENT_COMPOSE=$(grep "Docker Compose version" docker-versions.txt | cut -d ' ' -f 5 | tr -d 'v')
+
+          # Get runner versions
+          RUNNER_DOCKER=$(docker --version | cut -d ' ' -f 3 | cut -d ',' -f 1)
+          RUNNER_COMPOSE=$(docker compose version | 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
+          DOCKER_VERSION="${CURRENT_DOCKER}"
+          COMPOSE_VERSION="${CURRENT_COMPOSE}"
+
+          if version_gt "$RUNNER_DOCKER" "$CURRENT_DOCKER"; then
+            echo "Docker version $RUNNER_DOCKER is newer than $CURRENT_DOCKER, updating"
+            DOCKER_VERSION="$RUNNER_DOCKER"
+          else
+            echo "Docker version $RUNNER_DOCKER is not newer than $CURRENT_DOCKER, keeping current"
+          fi
+
+          if version_gt "$RUNNER_COMPOSE" "$CURRENT_COMPOSE"; then
+            echo "Docker Compose version $RUNNER_COMPOSE is newer than $CURRENT_COMPOSE, updating"
+            COMPOSE_VERSION="$RUNNER_COMPOSE"
+          else
+            echo "Docker Compose version $RUNNER_COMPOSE is not newer than $CURRENT_COMPOSE, keeping current"
+          fi
+
+          # Write versions to file
+          echo "- Docker version ${DOCKER_VERSION}, build unknown" > docker-versions.txt
+          echo "- Docker Compose version v${COMPOSE_VERSION}" >> 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)
+
+# 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 "$docker_compose_version"
+    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)
+
+# 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"