release/docker: Apply version to Engine and CLI too - #521
Merged
Merged
Conversation
Added an optional version argument so callers can set a release version independently of source tags while retaining the source commit identity. Explicit versions use the existing binary and package version formatting without being replaced by a pseudo version for untagged commits. Source-derived defaults remain unchanged, and NIGHTLY_BUILD=1 still forces a pseudo version. Added tests for overrides, prereleases, prefixed tags, untagged commits, and nightlies. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Pass DOCKER_VERSION to the Engine and CLI Bake targets. The release workflow applied the requested version only to the combined static archives. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
force-pushed
the
docker-version
branch
from
September 21, 2026 16:05
a4da717 to
525db3c
Compare
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
Version propagation is complete and preserves existing source-derived and nightly behavior.
Review effort: Balanced
Findings: None
What changed in this PR
Applies the requested Docker release version consistently to Engine, CLI, and combined package builds.
Changes:
- Passes
DOCKER_VERSIONthrough release workflows, Bake targets, and Docker build stages. - Adds explicit-version support to
gen-ver. - Preserves source-derived and nightly version behavior when appropriate.
| File | Description |
|---|---|
.github/workflows/release-docker.yml |
Passes the release version to Engine and CLI builds. |
docker-bake.hcl |
Propagates and documents DOCKER_VERSION. |
hack/scripts/gen-ver.sh |
Supports an optional explicit version. |
pkg/docker-engine/Dockerfile |
Exposes the version to Engine build stages. |
pkg/docker-engine/scripts/pkg-deb-build.sh |
Applies the version to DEB builds. |
pkg/docker-engine/scripts/pkg-rpm-build.sh |
Applies the version to RPM builds. |
pkg/docker-engine/scripts/pkg-static-build.sh |
Applies the version to static builds. |
pkg/docker-cli/Dockerfile |
Exposes the version to CLI build stages. |
pkg/docker-cli/scripts/pkg-deb-build.sh |
Applies the version to DEB builds. |
pkg/docker-cli/scripts/pkg-rpm-build.sh |
Applies the version to RPM builds. |
pkg/docker-cli/scripts/pkg-static-build.sh |
Applies the version to static builds. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
vvoland
marked this pull request as ready for review
September 21, 2026 17:11
crazy-max
approved these changes
Sep 21, 2026
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.
Pass DOCKER_VERSION to the Engine and CLI Bake targets. The release workflow applied the requested version only to the combined static archives.