fix(ci): preserve original docker version line when not upgrading

Keep the full original line (including build hash) from
docker-versions.txt when the runner's version is not newer,
instead of writing a hardcoded "build unknown" string.

Author: gounthar

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

@@ -69,38 +69,43 @@ jobs:
             [ "$(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')
+          # 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)
 
-          # 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')
+          # 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
-          DOCKER_VERSION="${CURRENT_DOCKER}"
-          COMPOSE_VERSION="${CURRENT_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_VERSION="$RUNNER_DOCKER"
+            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_VERSION="$RUNNER_COMPOSE"
+            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 version ${DOCKER_VERSION}, build unknown" > docker-versions.txt
-          echo "- Docker Compose version v${COMPOSE_VERSION}" >> docker-versions.txt
+          echo "$DOCKER_LINE" > docker-versions.txt
+          echo "$COMPOSE_LINE" >> docker-versions.txt
 
           # Only add the specific file we want
           git add docker-versions.txt