static: split cli, engine, and containerd packages

This splits the CLI, Engine, and containerd packages to allow downloading
the cli separate from the daemon, as well as (in future) allowing us to
do a containerd release without also requiring an engine release.

With this patch:

    make REF=v22.06.0-beta.0 VERSION=v22.06.0-beta.0 TARGETPLATFORM=linux/amd64 static

    static/build
    ├── bundles-ce-static-linux-x86_64.tar.gz
    └── linux
        └── amd64
            ├── containerd-1.6.4.tgz
            ├── docker-buildx-plugin-0.8.2.tgz
            ├── docker-cli-22.06.0-beta.0.tgz
            ├── docker-engine-22.06.0-beta.0.tgz
            ├── docker-compose-plugin-2.6.1.tgz
            ├── docker-rootless-extras-22.06.0-beta.0.tgz
            └── docker-scan-plugin-0.17.0.tgz

    2 directories, 8 files

    ls -lh static/build/linux/amd64/
    total 215208
    -rw-r--r--  1 sebastiaan  staff    31M Jun 29 00:21 containerd-1.6.4.tgz
    -rw-r--r--  1 sebastiaan  staff    14M Jun 29 00:21 docker-buildx-plugin-0.8.2.tgz
    -rw-r--r--  1 sebastiaan  staff   8.2M Jun 29 00:21 docker-cli-22.06.0-beta.0.tgz
    -rw-r--r--  1 sebastiaan  staff    19M Jun 29 00:21 docker-engine-22.06.0-beta.0.tgz
    -rw-r--r--  1 sebastiaan  staff   8.8M Jun 29 00:21 docker-compose-plugin-2.6.1.tgz
    -rw-r--r--  1 sebastiaan  staff    19M Jun 29 00:21 docker-rootless-extras-22.06.0-beta.0.tgz
    -rw-r--r--  1 sebastiaan  staff   4.4M Jun 29 00:21 docker-scan-plugin-0.17.0.tgz

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

Author: thaJeztah

static/Makefile

@@ -1,12 +1,15 @@
 include ../common.mk
 
-CLI_DIR=$(realpath $(CURDIR)/../src/github.com/docker/cli)
-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)
-SCAN_DIR=$(realpath $(CURDIR)/../src/github.com/docker/scan-cli-plugin)
+CLI_DIR     = $(realpath $(CURDIR)/../src/github.com/docker/cli)
+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)
+SCAN_DIR    = $(realpath $(CURDIR)/../src/github.com/docker/scan-cli-plugin)
+
+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))
 
-STATIC_VERSION=$(shell ./gen-static-ver $(CLI_DIR) $(VERSION))
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
 DIR_TO_HASH:=build/linux
 
@@ -16,8 +19,10 @@ export BUILDX_DIR
 export COMPOSE_DIR
 export SCAN_DIR
 
-export STATIC_VERSION
+export CLI_VERSION
+export ENGINE_VERSION
 export CONTAINERD_VERSION
+export CONTAINERD_PKG_VER
 export RUNC_VERSION
 
 .PHONY: help

static/build-static

@@ -34,7 +34,7 @@ build_cli() {
 			--build-arg PACKAGER_NAME \
 			--build-arg PLATFORM \
 			--build-arg PRODUCT \
-			--build-arg VERSION="${STATIC_VERSION}" \
+			--build-arg VERSION="${CLI_VERSION}" \
 			--output ./build \
 			--platform "${TARGETPLATFORM}" \
 			--target binary .
@@ -54,7 +54,7 @@ build_engine() {
 			--build-arg PLATFORM \
 			--build-arg PRODUCT \
 			--build-arg RUNC_VERSION \
-			--build-arg VERSION="${STATIC_VERSION}" \
+			--build-arg VERSION="${ENGINE_VERSION}" \
 			--output ./bundles \
 			--platform "${TARGETPLATFORM}" \
 			--target binary .
@@ -78,7 +78,7 @@ build_engine_cross() {
 			--build-arg PLATFORM \
 			--build-arg PRODUCT \
 			--build-arg RUNC_VERSION \
-			--build-arg VERSION="${STATIC_VERSION}" \
+			--build-arg VERSION="${ENGINE_VERSION}" \
 			--output ./bundles \
 			--target cross .
 		mkdir -p "./bundles/${TARGETPLATFORM}"
@@ -141,7 +141,9 @@ fi
 
 buildDir="${CURDIR}/build/${TARGETPLATFORM}"
 
-dockerBuildDir="${buildDir}/docker"
+dockerCLIBuildDir="${buildDir}/docker-cli"
+dockerBuildDir="${buildDir}/docker-engine"
+containerdBuildDir="${buildDir}/containerd"
 rootlessExtrasBuildDir="${buildDir}/docker-rootless-extras"
 buildxBuildDir="${buildDir}/docker-buildx"
 composeBuildDir="${buildDir}/docker-compose"
@@ -186,42 +188,75 @@ esac
 # cleanup
 [ -d "${buildDir}" ] && rm -r "${buildDir}"
 
-# docker
-mkdir -p "${dockerBuildDir}"
+# docker CLI
+mkdir -p "${dockerCLIBuildDir}"
 case ${TARGETOS} in
 	linux | darwin)
-		cp "${CLI_DIR}"/build/"${targetPair}"/docker-"${TARGETOS}"-* "${dockerBuildDir}/docker"
+		cp "${CLI_DIR}"/build/"${targetPair}"/docker-"${TARGETOS}"-* "${dockerCLIBuildDir}/docker"
 		;;
 	windows)
-		cp "${CLI_DIR}"/build/"${targetPair}"/docker-"${TARGETOS}"-*.exe "${dockerBuildDir}/docker.exe"
+		cp "${CLI_DIR}"/build/"${targetPair}"/docker-"${TARGETOS}"-*.exe "${dockerCLIBuildDir}/docker.exe"
+		;;
+esac
+# package docker CLI
+case ${TARGETOS} in
+	linux | darwin)
+		(
+			set -x
+			tar -C "${buildDir}" -c -z -f "${buildDir}/docker-cli-${CLI_VERSION}.tgz" docker-cli
+		)
+		;;
+	windows)
+		(
+			cd "${buildDir}"
+			set -x
+			zip -r "docker-cli-${CLI_VERSION}.zip" docker-cli
+		)
 		;;
 esac
+
+# docker, containerd, and runc
+mkdir -p "${dockerBuildDir}"
 case ${TARGETOS} in
 	linux)
-		for f in dockerd containerd ctr containerd-shim containerd-shim-runc-v2 docker-init docker-proxy runc; do
+		for f in dockerd docker-init docker-proxy; do
 			if [ -f "${ENGINE_DIR}/bundles/${TARGETPLATFORM}/$f" ]; then
 				cp -L "${ENGINE_DIR}/bundles/${TARGETPLATFORM}/$f" "${dockerBuildDir}/$f"
 			fi
 		done
+		# TODO containerd binaries should be built as part of containerd-packaging, not as part of docker/docker-ce-packaging
+		mkdir -p "${containerdBuildDir}"
+		for f in containerd ctr containerd-shim containerd-shim-runc-v2 runc; do
+			if [ -f "${ENGINE_DIR}/bundles/${TARGETPLATFORM}/$f" ]; then
+				cp -L "${ENGINE_DIR}/bundles/${TARGETPLATFORM}/$f" "${containerdBuildDir}/$f"
+			fi
+		done
 		;;
 	windows)
 		cp "${ENGINE_DIR}"/bundles/"${TARGETPLATFORM}"/dockerd.exe "${dockerBuildDir}/dockerd.exe"
 		cp "${ENGINE_DIR}"/bundles/"${TARGETPLATFORM}"/docker-proxy.exe "${dockerBuildDir}/docker-proxy.exe"
 		;;
 esac
-# package docker
+# package docker, containerd, and runc
 case ${TARGETOS} in
-	linux | darwin)
+	darwin)
+		(
+			set -x
+			tar -C "${buildDir}" -c -z -f "${buildDir}/docker-engine-${ENGINE_VERSION}.tgz" docker-engine
+		)
+		;;
+	linux)
 		(
 			set -x
-			tar -C "${buildDir}" -c -z -f "${buildDir}/docker-${STATIC_VERSION}.tgz" docker
+			tar -C "${buildDir}" -c -z -f "${buildDir}/docker-engine-${ENGINE_VERSION}.tgz" docker-engine
+			tar -C "${buildDir}" -c -z -f "${buildDir}/containerd-${CONTAINERD_PKG_VER#v}.tgz" containerd
 		)
 		;;
 	windows)
 		(
 			cd "${buildDir}"
 			set -x
-			zip -r "docker-${STATIC_VERSION}.zip" docker
+			zip -r "docker-engine-${ENGINE_VERSION}.zip" docker-engine
 		)
 		;;
 esac
@@ -243,7 +278,7 @@ if [ -d "${rootlessExtrasBuildDir}" ]; then
 		linux)
 			(
 				set -x
-				tar -C "${buildDir}" -c -z -f "${buildDir}/docker-rootless-extras-${STATIC_VERSION}.tgz" docker-rootless-extras
+				tar -C "${buildDir}" -c -z -f "${buildDir}/docker-rootless-extras-${ENGINE_VERSION}.tgz" docker-rootless-extras
 			)
 			;;
 	esac
@@ -356,5 +391,6 @@ fi
 	set -x
 	cd "${buildDir}"
 	rm -r */
+	# bundle is expected to have a tar.gz extension, unlike the other archives, which use .tgz
 	tar -zvcf "${CURDIR}/build/bundles-ce-static-${TARGETOS}-${BUNDLEARCH}.tar.gz" .
 )

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