pkg: use GITCOMMIT

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

common.mk

@@ -16,7 +16,7 @@ BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 n
 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 DEFAULT_PRODUCT_LICENSE:=Community Engine
 PACKAGER_NAME?=
-DOCKER_GITCOMMIT:=abcdefg
+GITCOMMIT:=abcdefg
 GO_VERSION:=1.18.3
 PLATFORM=Docker Engine - Community
 SHELL:=/bin/bash

deb/common/rules

@@ -10,7 +10,7 @@ override_dh_builddeb:
 
 override_dh_auto_build:
 	# Build the daemon and dependencies
-	cd /go/src/github.com/docker/docker && DOCKER_GITCOMMIT=$(ENGINE_GITCOMMIT) PRODUCT=docker ./hack/make.sh dynbinary
+	cd /go/src/github.com/docker/docker && GITCOMMIT=$(ENGINE_GITCOMMIT) PRODUCT=docker ./hack/make.sh dynbinary
 	cd /go/src/github.com/docker/docker && TMP_GOPATH="/go" hack/dockerfile/install/install.sh tini
 	cd /go/src/github.com/docker/docker && TMP_GOPATH="/go" hack/dockerfile/install/install.sh rootlesskit dynamic
 	# Build the CLI

rpm/SPECS/docker-ce-rootless-extras.spec

@@ -36,7 +36,7 @@ Either VPNKit or slirp4netns (>= 0.4.0) needs to be installed separately.
 
 %build
 
-export DOCKER_GITCOMMIT=%{_gitcommit_engine}
+export GITCOMMIT=%{_gitcommit_engine}
 mkdir -p /go/src/github.com/docker
 ln -snf ${RPM_BUILD_DIR}/src/engine /go/src/github.com/docker/docker
 TMP_GOPATH="/go" ${RPM_BUILD_DIR}/src/engine/hack/dockerfile/install/install.sh rootlesskit dynamic

rpm/SPECS/docker-ce.spec

@@ -80,7 +80,7 @@ depending on a particular stack or provider.
 
 %build
 
-export DOCKER_GITCOMMIT=%{_gitcommit_engine}
+export GITCOMMIT=%{_gitcommit_engine}
 mkdir -p /go/src/github.com/docker
 ln -snf ${RPM_BUILD_DIR}/src/engine /go/src/github.com/docker/docker
 

rpm/gen-rpm-ver

@@ -73,9 +73,9 @@ rpmRelease=1
 tilde='~'
 rpmVersion="${rpmVersion//-/$tilde}"
 
-DOCKER_GITCOMMIT=$($GIT_COMMAND rev-parse --short HEAD)
+GITCOMMIT=$($GIT_COMMAND rev-parse --short HEAD)
 if [ -n "$($GIT_COMMAND status --porcelain --untracked-files=no)" ]; then
-	DOCKER_GITCOMMIT="$DOCKER_GITCOMMIT-unsupported"
+	GITCOMMIT="$GITCOMMIT-unsupported"
 fi
 
 # if we have a "-dev" suffix or have change in Git, this is a nightly build, and
@@ -112,4 +112,4 @@ fi
 
 # Replace any remaining dashes with periods
 rpmVersion="${rpmVersion//-/.}"
-echo "$rpmVersion $rpmRelease $DOCKER_GITCOMMIT $origVersion"
+echo "$rpmVersion $rpmRelease $GITCOMMIT $origVersion"