fix(ci): only update Docker versions when runner has newer version#2061
Merged
gounthar merged 242 commits intojenkins-docs:mainfrom Feb 25, 2026
Merged
fix(ci): only update Docker versions when runner has newer version#2061gounthar merged 242 commits intojenkins-docs:mainfrom
gounthar merged 242 commits intojenkins-docs:mainfrom
Conversation
Bumps debian from bookworm-20231218 to bookworm-20240110. --- updated-dependencies: - dependency-name: debian dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…dekick/debian-bookworm-20240110 chore(deps): bump debian from bookworm-20231218 to bookworm-20240110 in /dockerfiles/sidekick
chore(jenkins): Updates Jenkins plugins
Bumps [updatecli/updatecli-action](https://github.com/updatecli/updatecli-action) from 2.52.0 to 2.53.0. - [Release notes](https://github.com/updatecli/updatecli-action/releases) - [Commits](updatecli/updatecli-action@v2.52.0...v2.53.0) --- updated-dependencies: - dependency-name: updatecli/updatecli-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [anchore/scan-action](https://github.com/anchore/scan-action) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/anchore/scan-action/releases) - [Changelog](https://github.com/anchore/scan-action/blob/main/CHANGELOG.md) - [Commits](anchore/scan-action@1d59d90...0550541) --- updated-dependencies: - dependency-name: anchore/scan-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
chore(jenkins): Updates Jenkins plugins
chore(jenkins): Updates Jenkins plugins
…cli/updatecli-action-2.53.0 chore(deps): bump updatecli/updatecli-action from 2.52.0 to 2.53.0
…e/scan-action-3.6.0 chore(deps): bump anchore/scan-action from 3.5.0 to 3.6.0
Bumps [updatecli/updatecli-action](https://github.com/updatecli/updatecli-action) from 2.53.0 to 2.54.0. - [Release notes](https://github.com/updatecli/updatecli-action/releases) - [Commits](updatecli/updatecli-action@v2.53.0...v2.54.0) --- updated-dependencies: - dependency-name: updatecli/updatecli-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps debian from bookworm-20240110 to bookworm-20240130. --- updated-dependencies: - dependency-name: debian dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps jenkins/ssh-agent from 5.22.0 to 5.24.0. --- updated-dependencies: - dependency-name: jenkins/ssh-agent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps jenkins/ssh-agent from 5.22.0 to 5.24.0. --- updated-dependencies: - dependency-name: jenkins/ssh-agent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps jenkins/ssh-agent from 5.22.0 to 5.24.0. --- updated-dependencies: - dependency-name: jenkins/ssh-agent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5 to 6. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](release-drafter/release-drafter@v5...v6) --- updated-dependencies: - dependency-name: release-drafter/release-drafter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [anchore/scan-action](https://github.com/anchore/scan-action) from 3.6.0 to 3.6.4. - [Release notes](https://github.com/anchore/scan-action/releases) - [Changelog](https://github.com/anchore/scan-action/blob/main/CHANGELOG.md) - [Commits](anchore/scan-action@0550541...3343887) --- updated-dependencies: - dependency-name: anchore/scan-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps jenkins/ssh-agent from 5.22.0 to 5.24.0. --- updated-dependencies: - dependency-name: jenkins/ssh-agent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps jenkins/ssh-agent from 5.22.0 to 5.24.0. --- updated-dependencies: - dependency-name: jenkins/ssh-agent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases) - [Commits](codacy/codacy-analysis-cli-action@5cc54a7...33d4559) --- updated-dependencies: - dependency-name: codacy/codacy-analysis-cli-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…cli/updatecli-action-2.54.0 chore(deps): bump updatecli/updatecli-action from 2.53.0 to 2.54.0
…dekick/debian-bookworm-20240130 chore(deps): bump debian from bookworm-20240110 to bookworm-20240130 in /dockerfiles/sidekick
…thon/jenkins/ssh-agent-5.24.0 chore(deps): bump jenkins/ssh-agent from 5.22.0 to 5.24.0 in /dockerfiles/python
…ven/jenkins/ssh-agent-5.24.0 chore(deps): bump jenkins/ssh-agent from 5.22.0 to 5.24.0 in /dockerfiles/maven
…e-drafter/release-drafter-6 chore(deps): bump release-drafter/release-drafter from 5 to 6
…e/scan-action-3.6.4 chore(deps): bump anchore/scan-action from 3.6.0 to 3.6.4
…lti/jenkins/ssh-agent-5.24.0 chore(deps): bump jenkins/ssh-agent from 5.22.0 to 5.24.0 in /dockerfiles/multi
Bumps [updatecli/updatecli-action](https://github.com/updatecli/updatecli-action) from 2.92.0 to 2.93.0. - [Release notes](https://github.com/updatecli/updatecli-action/releases) - [Commits](updatecli/updatecli-action@v2.92.0...v2.93.0) --- updated-dependencies: - dependency-name: updatecli/updatecli-action dependency-version: 2.93.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ecli/updatecli-action-2.93.0 chore(deps): bump updatecli/updatecli-action from 2.92.0 to 2.93.0
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.
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.
The docker-compose-version guard echoed $docker_compose_version (from docker-versions.txt) instead of the README value when current >= new, making the downgrade prevention a no-op. Also add head -n1 to grep in both scripts to handle README files with multiple version mentions.
There was a problem hiding this comment.
Pull request overview
Updates the CI + Updatecli version-detection logic to avoid “ping-pong” PRs caused by GitHub Actions runners having different Docker / Docker Compose versions, by only updating when the detected version is strictly newer.
Changes:
- Update Updatecli source scripts to compare
docker-versions.txtvsREADME.mdand only output a newer version (usingsort -V). - Update the Docker registry push workflow to preserve existing
docker-versions.txtlines unless the runner’s version is strictly newer. - Preserve the original
docker-versions.txtline (including build hash) when not upgrading.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
updatecli/scripts/docker-version.sh |
Compares Docker version from docker-versions.txt to README and avoids outputting downgrades. |
updatecli/scripts/docker-compose-version.sh |
Adds similar comparison logic for Docker Compose (but currently has a downgrade-prevention bug). |
.github/workflows/github-docker-registry-push.yml |
Only rewrites docker-versions.txt when runner versions are strictly newer; otherwise preserves existing lines. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
sort -Vand only update when the new version is strictly newerdocker-versions.txtline (including build hash) when not upgradingPre-PR Review
Reviewers: Copilot/GPT-4.1 (automated pre-review), CodeRabbit (pending)
Addressed
docker-versions.txtwhen not upgradingdocker-versions.txtexists; if it doesn't,grepreturns empty and comparison falls through to using the runner's version (safe default)Acknowledged
sort -Vhandles pre-release tags correctly; Docker uses standard semverTest plan
docker-versions.txtshould remain unchangeddocker-versions.txtshould updatedocker-versions.txtcontaining an older version than README.md → README.md should not changedocker-versions.txtcontaining a newer version than README.md → README.md should update