Skip to content

docker: Match version format with ce-packaging #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vvoland merged 2 commits into from
Oct 8, 2026
Merged

docker: Match version format with ce-packaging #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcd7cfc
Use short Git commit in docker CLI and engine version output
vvoland Oct 7, 2026
0c3defb
pkg: Drop the v prefix from static CLI and Engine versions
vvoland Oct 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/docker-cli/scripts/pkg-deb-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ mkdir -p "${pkgoutput}"
set -x

chmod -x debian/control debian/docs debian/*.manpages
VERSION=${GENVER_VERSION#v} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
VERSION=${GENVER_VERSION#v} REVISION=${GENVER_COMMIT_SHORT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
cp /root/docker-* "${pkgoutput}"/
2 changes: 1 addition & 1 deletion pkg/docker-cli/scripts/pkg-rpm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ rpmDefine=(
--define "_version ${GENVER_PKG_VERSION}"
--define "_origversion ${GENVER_VERSION#v}"
--define "_release ${PKG_RPM_RELEASE:-${GENVER_RPM_RELEASE}}"
--define "_commit ${GENVER_COMMIT}"
--define "_commit ${GENVER_COMMIT_SHORT}"
)

pkgoutput="${OUTDIR}/${DISTRO_RELEASE}/${DISTRO_SUITE}/$(xx-info arch)"
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ clibin="docker${binext}"
(
set -x
pushd ${SRCDIR}
VERSION=${GENVER_VERSION} GITCOMMIT=${GENVER_COMMIT} GO_LINKMODE=static TARGET=${BUILDDIR}/${PKG_NAME} ./scripts/build/binary
VERSION=${GENVER_VERSION#v} GITCOMMIT=${GENVER_COMMIT_SHORT} GO_LINKMODE=static TARGET=${BUILDDIR}/${PKG_NAME} ./scripts/build/binary
popd
xx-verify --static "${BUILDDIR}/${PKG_NAME}/docker"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ mkdir -p ${BUILDDIR}/${PKG_NAME}
(
set -x
pushd ${SRCDIR}
CGO_ENABLED=1 VERSION=${GENVER_VERSION} DOCKER_GITCOMMIT=${GENVER_COMMIT} ./hack/make.sh binary
CGO_ENABLED=1 VERSION=${GENVER_VERSION#v} DOCKER_GITCOMMIT=${GENVER_COMMIT_SHORT} ./hack/make.sh binary
mv "./bundles/binary-daemon/dockerd${binext}" "${BUILDDIR}/${PKG_NAME}/"
if [ "$(xx-info os)" != "windows" ]; then
mv "./bundles/binary-daemon/docker-proxy${binext}" "${BUILDDIR}/${PKG_NAME}/"
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ fetch_git_ref() {
(
set -x
pushd "${ENGINE_SRCDIR}"
CGO_ENABLED=1 VERSION="${version}" DOCKER_GITCOMMIT="${ENGINE_GENVER_COMMIT}" ./hack/make.sh binary
CGO_ENABLED=1 VERSION="${version}" DOCKER_GITCOMMIT="${ENGINE_GENVER_COMMIT_SHORT}" ./hack/make.sh binary
mv "./bundles/binary-daemon/dockerd${binext}" "${engine_builddir}/"
if [ "$(xx-info os)" != "windows" ]; then
mv "./bundles/binary-daemon/docker-proxy${binext}" "${engine_builddir}/"
Expand All @@ -128,7 +128,7 @@ fi
(
set -x
pushd "${CLI_SRCDIR}"
CGO_ENABLED=0 GO111MODULE=off VERSION="${version}" GITCOMMIT="${CLI_GENVER_COMMIT}" GO_LINKMODE=static TARGET="${cli_builddir}" ./scripts/build/binary
CGO_ENABLED=0 GO111MODULE=off VERSION="${version}" GITCOMMIT="${CLI_GENVER_COMMIT_SHORT}" GO_LINKMODE=static TARGET="${cli_builddir}" ./scripts/build/binary
popd
xx-verify --static "${cli_builddir}/docker"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker/scripts/pkg-static-darwin-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ mkdir -p "$cli_builddir"
(
set -x
cd "${CLI_SRCDIR}"
CGO_ENABLED=0 GO111MODULE=off VERSION="${VERSION#v}" GITCOMMIT="${CLI_COMMIT}" GO_LINKMODE=static TARGET="${cli_builddir}" ./scripts/build/binary
CGO_ENABLED=0 GO111MODULE=off VERSION="${VERSION#v}" GITCOMMIT="${CLI_COMMIT:0:7}" GO_LINKMODE=static TARGET="${cli_builddir}" ./scripts/build/binary
)
xx-verify --static "${cli_builddir}/docker"

Expand Down
Loading