Merge pull request #43762 from thaJeztah/build_no_version

hack: remove version from binaries, and remove symlinks

hack/make/.binary

@@ -8,7 +8,6 @@ binary_extension() {
 	fi
 }
 
-BINARY_NAME="$BINARY_SHORT_NAME-$VERSION"
 BINARY_EXTENSION="$(binary_extension)"
 BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
 
@@ -116,6 +115,4 @@ hash_files() {
 )
 
 echo "Created binary: $DEST/$BINARY_FULLNAME"
-ln -sf "$BINARY_FULLNAME" "$DEST/$BINARY_SHORT_NAME$BINARY_EXTENSION"
-
 hash_files "$DEST/$BINARY_FULLNAME"

hack/make/.mkwinres

@@ -16,7 +16,7 @@ VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | sed -re
 # Microsoft Windows Version Information and an icon using go-winres.
 # https://docs.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-block
 # https://github.com/tc-hib/go-winres#json-format
-cat > "./cli/winresources/${BINARY_SHORT_NAME}/winres.json" << EOL
+cat > "./cli/winresources/${BINARY_NAME}/winres.json" << EOL
 {
   "RT_GROUP_ICON": {
     "#1": {
@@ -76,10 +76,10 @@ cat > "./cli/winresources/${BINARY_SHORT_NAME}/winres.json" << EOL
 EOL
 (
 	set -x
-	cat "./cli/winresources/${BINARY_SHORT_NAME}/winres.json"
+	cat "./cli/winresources/${BINARY_NAME}/winres.json"
 )
 
 # Create winresources package stub if removed while using tmpfs in Dockerfile
-if [ ! -f "./cli/winresources/${BINARY_SHORT_NAME}/winresources.go" ]; then
-	echo "package winresources" > "./cli/winresources/${BINARY_SHORT_NAME}/winresources.go"
+if [ ! -f "./cli/winresources/${BINARY_NAME}/winresources.go" ]; then
+	echo "package winresources" > "./cli/winresources/${BINARY_NAME}/winresources.go"
 fi

hack/make/binary-daemon

@@ -34,7 +34,7 @@ copy_binaries() {
 
 (
 	GO_PACKAGE='github.com/docker/docker/cmd/dockerd'
-	BINARY_SHORT_NAME='dockerd'
+	BINARY_NAME='dockerd'
 
 	source "${MAKEDIR}/.binary"
 	copy_binaries "$DEST" 'hash'

hack/make/binary-proxy

@@ -6,7 +6,7 @@ set -e
 	export CGO_ENABLED=0
 
 	GO_PACKAGE='github.com/docker/docker/cmd/docker-proxy'
-	BINARY_SHORT_NAME='docker-proxy'
+	BINARY_NAME='docker-proxy'
 
 	source "${MAKEDIR}/.binary"
 )

hack/make/cross

@@ -2,7 +2,7 @@
 set -e
 
 # if we have our linux/amd64 version compiled, let's symlink it in
-if [ -x "${DEST}/../binary-daemon/dockerd-${VERSION}" ]; then
+if [ -x "${DEST}/../binary-daemon/dockerd" ]; then
 	arch=$(go env GOHOSTARCH)
 	mkdir -p "$DEST/linux/${arch}"
 	(

hack/make/dynbinary-daemon

@@ -11,6 +11,6 @@ set -e
 	export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here
 
 	GO_PACKAGE='github.com/docker/docker/cmd/dockerd'
-	BINARY_SHORT_NAME='dockerd'
+	BINARY_NAME='dockerd'
 	source "${MAKEDIR}/.binary"
 )

hack/make/dynbinary-proxy

@@ -10,6 +10,6 @@ set -e
 	export BUILDFLAGS=("${BUILDFLAGS[@]/static_build /}") # we're not building a "static" binary here
 
 	GO_PACKAGE='github.com/docker/docker/cmd/docker-proxy'
-	BINARY_SHORT_NAME='docker-proxy'
+	BINARY_NAME='docker-proxy'
 	source "${MAKEDIR}/.binary"
 )