split engine and cli versions

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

static/Makefile

@@ -5,7 +5,8 @@ ENGINE_DIR=$(realpath $(CURDIR)/../src/github.com/docker/docker)
 BUILDX_DIR=$(realpath $(CURDIR)/../src/github.com/docker/buildx)
 COMPOSE_DIR=$(realpath $(CURDIR)/../src/github.com/docker/compose)
 
-GEN_STATIC_VER=$(shell ./gen-static-ver $(CLI_DIR) $(VERSION))
+CLI_VERSION=$(shell ./gen-static-ver $(CLI_DIR) $(VERSION))
+ENGINE_VERSION=$(shell ./gen-static-ver $(ENGINE_DIR) $(VERSION))
 CONTAINERD_PKG_VER=$(shell ./gen-containerd-ver $(ENGINE_DIR) $(CONTAINERD_VERSION))
 
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
@@ -51,14 +52,14 @@ static-linux: static-cli static-engine static-buildx-plugin static-compose-plugi
 	# docker cli binaries
 	mkdir -p build/linux/docker-cli
 	cp $(CLI_DIR)/build/docker build/linux/docker-cli/
-	tar -C build/linux -c -z -f build/linux/docker-cli-$(GEN_STATIC_VER).tgz docker-cli
+	tar -C build/linux -c -z -f build/linux/docker-cli-$(CLI_VERSION).tgz docker-cli
 
 	# docker engine binaries
 	mkdir -p build/linux/docker-engine
 	for f in dockerd docker-init docker-proxy; do \
 		cp -L $(ENGINE_DIR)/bundles/binary-daemon/$$f build/linux/docker-engine/$$f; \
 	done
-	tar -C build/linux -c -z -f build/linux/docker-engine-$(GEN_STATIC_VER).tgz docker-engine
+	tar -C build/linux -c -z -f build/linux/docker-engine-$(ENGINE_VERSION).tgz docker-engine
 
 	# containerd binaries
 	mkdir -p build/linux/containerd
@@ -74,7 +75,7 @@ static-linux: static-cli static-engine static-buildx-plugin static-compose-plugi
 			cp -L $(ENGINE_DIR)/bundles/binary-daemon/$$f build/linux/docker-rootless-extras/$$f; \
 		fi \
 	done
-	tar -C build/linux -c -z -f build/linux/docker-rootless-extras-$(GEN_STATIC_VER).tgz docker-rootless-extras
+	tar -C build/linux -c -z -f build/linux/docker-rootless-extras-$(ENGINE_VERSION).tgz docker-rootless-extras
 
 	# compose, buildx
 	tar -C "$(COMPOSE_DIR)"/bin/ -c -z -f build/linux/docker-compose-plugin-"$(DOCKER_COMPOSE_REF:v%=%)".tgz docker-compose
@@ -104,7 +105,7 @@ cross-mac-amd64: buildx
 	# cli
 	mkdir -p build/mac/amd64/docker-cli
 	cp -L $(CLI_DIR)/build/docker build/mac/amd64/docker-cli/docker
-	tar -C build/mac/amd64/ -c -z -f build/mac/amd64/docker-cli-$(GEN_STATIC_VER).tgz docker-cli
+	tar -C build/mac/amd64/ -c -z -f build/mac/amd64/docker-cli-$(CLI_VERSION).tgz docker-cli
 
 	# compose, buildx
 	tar -C "$(COMPOSE_DIR)"/bin/ -c -z -f build/mac/amd64/docker-compose-plugin-"$(DOCKER_COMPOSE_REF:v%=%)".tgz docker-compose
@@ -121,7 +122,7 @@ cross-mac-arm64: buildx
 	# cli
 	mkdir -p build/mac/arm64/docker-cli
 	cp -L $(CLI_DIR)/build/docker build/mac/arm64/docker-cli/docker
-	tar -C build/mac/arm64/ -c -z -f build/mac/arm64/docker-cli-$(GEN_STATIC_VER).tgz docker-cli
+	tar -C build/mac/arm64/ -c -z -f build/mac/arm64/docker-cli-$(CLI_VERSION).tgz docker-cli
 
 	# compose, buildx
 	tar -C "$(COMPOSE_DIR)"/bin/ -c -z -f build/mac/arm64/docker-compose-plugin-"$(DOCKER_COMPOSE_REF:v%=%)".tgz docker-compose
@@ -145,25 +146,25 @@ cross-win: cross-win-engine
 	cp $(COMPOSE_DIR)/bin/docker-compose/docker-compose.exe build/win/amd64/docker-compose/docker-compose.exe
 
 	docker run --rm -v $(CURDIR)/build/win/amd64:/v -w /v alpine sh -c 'apk add --no-cache zip \
-	&& zip -r docker-cli-$(GEN_STATIC_VER).zip docker-cli \
-	&& zip -r docker-engine-$(GEN_STATIC_VER).zip docker-engine \
-	&& zip -r docker-buildx-plugin--$(DOCKER_BUILDX_REF:v%=%).zip docker-buildx  \
-	&& zip -r docker-compose-plugin--$(DOCKER_COMPOSE_REF:v%=%).zip docker-compose'
+	&& zip -r docker-cli-$(CLI_VERSION).zip docker-cli \
+	&& zip -r docker-engine-$(ENGINE_VERSION).zip docker-engine \
+	&& zip -r docker-buildx-plugin-$(DOCKER_BUILDX_REF:v%=%).zip docker-buildx  \
+	&& zip -r docker-compose-plugin-$(DOCKER_COMPOSE_REF:v%=%).zip docker-compose'
 	$(CHOWN) -R $(shell id -u):$(shell id -g) build
 
 .PHONY: cross-arm
 cross-arm: cross-all-cli ## create tgz with linux armhf client only
 	mkdir -p build/arm/docker-cli
 	cp $(CLI_DIR)/build/docker-linux-arm build/arm/docker-cli/docker
-	tar -C build/arm -c -z -f build/arm/docker-cli-$(GEN_STATIC_VER).tgz docker-cli
+	tar -C build/arm -c -z -f build/arm/docker-cli-$(CLI_VERSION).tgz docker-cli
 
 .PHONY: static-cli
 static-cli:
-	cd $(CLI_DIR) && VERSION=$(GEN_STATIC_VER) docker buildx bake --set binary.platform=$(TARGETPLATFORM) --set binary.args.CGO_ENABLED=$(CGO_ENABLED) binary
+	cd $(CLI_DIR) && VERSION=$(CLI_VERSION) docker buildx bake --set binary.platform=$(TARGETPLATFORM) --set binary.args.CGO_ENABLED=$(CGO_ENABLED) binary
 
 .PHONY: static-engine
 static-engine:
-	$(MAKE) -C $(ENGINE_DIR) VERSION=$(GEN_STATIC_VER) DOCKER_BUILD_OPTS="$(DOCKER_BUILD_OPTS)" binary
+	$(MAKE) -C $(ENGINE_DIR) VERSION=$(ENGINE_VERSION) DOCKER_BUILD_OPTS="$(DOCKER_BUILD_OPTS)" binary
 
 .PHONY: static-buildx-plugin
 static-buildx-plugin:
@@ -182,12 +183,12 @@ static-compose-plugin:
 
 .PHONY: cross-cli
 cross-cli:
-	cd $(CLI_DIR) && VERSION=$(GEN_STATIC_VER) docker buildx bake --set binary.platform="$(or $(TARGETPLATFORM),local)" binary
+	cd $(CLI_DIR) && VERSION=$(CLI_VERSION) docker buildx bake --set binary.platform="$(or $(TARGETPLATFORM),local)" binary
 
 .PHONY: cross-all-cli
 cross-all-cli:
-	$(MAKE) -C $(CLI_DIR) -f docker.Makefile VERSION=$(GEN_STATIC_VER) cross
+	$(MAKE) -C $(CLI_DIR) -f docker.Makefile VERSION=$(CLI_VERSION) cross
 
 .PHONY: cross-win-engine
 cross-win-engine:
-	$(MAKE) -C $(ENGINE_DIR) VERSION=$(GEN_STATIC_VER) DOCKER_CROSSPLATFORMS=windows/amd64 DOCKER_BUILD_OPTS="$(DOCKER_BUILD_OPTS)" cross
+	$(MAKE) -C $(ENGINE_DIR) VERSION=$(ENGINE_VERSION) DOCKER_CROSSPLATFORMS=windows/amd64 DOCKER_BUILD_OPTS="$(DOCKER_BUILD_OPTS)" cross