fix containerd version

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

Author: thaJeztah

static/Makefile

@@ -6,6 +6,8 @@ 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))
+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
 DIR_TO_HASH:=build/linux
 DOCKER_CLI_GOLANG_IMG=golang:$(GO_VERSION)
@@ -58,16 +60,7 @@ static-linux: static-cli static-engine static-buildx-plugin static-compose-plugi
 	for f in containerd ctr containerd-shim-runc-v2 runc; do \
 		cp -L $(ENGINE_DIR)/bundles/binary-daemon/$$f build/linux/containerd/$$f; \
 	done
-
-	# Select the default version of containerd based on the docker engine source,
-	# which is needed for naming the produced .tgz file.
-	# TODO containerd binaries should be built as part of containerd-packaging, not as part of docker/docker-ce-packaging
-	set -ex; if [ -z "$(CONTAINERD_VERSION)" ]; then \
-		export containerd_pkg_version="$$(awk -F'=' '$$1 == "ARG CONTAINERD_VERSION" {{sub("v","")}; print $$2 }' "$(ENGINE_DIR)/Dockerfile.windows")"; \
-	else \
-		export containerd_pkg_version="$(CONTAINERD_VERSION:v%=%)"; \
-	fi \
-	&& tar -C build/linux -c -z -f build/linux/containerd-$${containerd_pkg_version}.tgz containerd
+	tar -C build/linux -c -z -f build/linux/containerd-$(CONTAINERD_PKG_VER).tgz containerd
 
 	# extra binaries for running rootless
 	mkdir -p build/linux/docker-rootless-extras

static/gen-containerd-ver

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+engine_dir="$1"
+# containerd_pkg_version is used to name the containerd-<version>.tgz file.
+containerd_pkg_version="$2"
+
+if [ -z "${containerd_pkg_version}" ]; then
+	# If no custom version is set for containerd, we select the default version of
+	# containerd based on the docker engine source.
+	# which is needed for naming the produced .tgz file.
+	# TODO containerd binaries should be built as part of containerd-packaging, not as part of docker/docker-ce-packaging
+	awk -F'=' '$1 == "ARG CONTAINERD_VERSION" {{sub("v","")}; print $2 }' "${engine_dir}/Dockerfile.windows"
+else
+	echo "${containerd_pkg_version#v}"
+fi