static: add compose and scan cli plugins

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

Author: crazy-max

static/Makefile

@@ -3,6 +3,8 @@ 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)
 
 STATIC_VERSION=$(shell ./gen-static-ver $(CLI_DIR) $(VERSION))
 HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files
@@ -11,6 +13,8 @@ DIR_TO_HASH:=build/linux
 export CLI_DIR
 export ENGINE_DIR
 export BUILDX_DIR
+export COMPOSE_DIR
+export SCAN_DIR
 
 export STATIC_VERSION
 export CONTAINERD_VERSION

static/build-static

@@ -101,6 +101,26 @@ build_buildx() {
 	)
 }
 
+build_compose() {
+	[ -d "${COMPOSE_DIR:?}/bin" ] && rm -r "${COMPOSE_DIR:?}/bin"
+	(
+		cd "${COMPOSE_DIR}"
+		set -x
+		# TODO: Add TARGETPLATFORM support on compose repo to build efficiently with buildx
+		make GIT_TAG="${DOCKER_COMPOSE_REF}" cross
+	)
+}
+
+build_scan() {
+	[ -d "${SCAN_DIR:?}/bin" ] && rm -r "${SCAN_DIR:?}/bin"
+	(
+		cd "${SCAN_DIR}"
+		set -x
+		# TODO: Add TARGETPLATFORM support on scan-cli-plugin repo to build efficiently with --platform
+		make GIT_TAG_NAME="${DOCKER_SCAN_REF}" cross
+	)
+}
+
 CROSS=true
 if [ "$TARGETOS" = "linux" ] && [ "$CURARCH$CURVARIANT" = "$TARGETARCH$TARGETVARIANT" ]; then
 	CROSS=false
@@ -126,6 +146,8 @@ buildDir="${CURDIR}/build/${TARGETPLATFORM}"
 dockerBuildDir="${buildDir}/docker"
 rootlessExtrasBuildDir="${buildDir}/docker-rootless-extras"
 buildxBuildDir="${buildDir}/docker-buildx"
+composeBuildDir="${buildDir}/docker-compose"
+scanBuildDir="${buildDir}/docker-scan"
 
 # create docker-container builder
 docker buildx inspect | grep -q 'Driver: docker-container' || docker buildx create --use
@@ -139,15 +161,27 @@ case ${TARGETOS} in
 			build_engine_cross
 		fi
 		build_buildx
+		build_compose
+		# TODO change once we support scan-plugin on other architectures
+		if [ "${TARGETARCH}" = "amd64" ]; then
+			build_scan
+		fi
 		;;
 	darwin)
 		build_cli
 		build_buildx
+		build_compose
+		build_scan
 		;;
 	windows)
 		build_cli
 		build_engine_cross
 		build_buildx
+		build_compose
+		# TODO change once we support scan-plugin on other architectures
+		if [ "${TARGETARCH}" = "amd64" ]; then
+			build_scan
+		fi
 		;;
 esac
 
@@ -218,31 +252,106 @@ if [ -d "${rootlessExtrasBuildDir}" ]; then
 fi
 
 # buildx
-mkdir -p "${buildxBuildDir}"
-case ${TARGETOS} in
-	linux | darwin)
-		cp "${BUILDX_DIR}/bin/${targetPair}/buildx" "${buildxBuildDir}/docker-buildx"
-		;;
-	windows)
-		cp "${BUILDX_DIR}/bin/${targetPair}/buildx.exe" "${buildxBuildDir}/docker-buildx.exe"
-		;;
-esac
-# package buildx
-case ${TARGETOS} in
-	linux | darwin)
-		(
-			set -x
-			tar -C "${buildDir}" -c -z -f "${buildDir}/docker-buildx-plugin-${DOCKER_BUILDX_REF#v}.tgz" docker-buildx
-		)
-		;;
-	windows)
-		(
-			cd "${buildDir}"
-			set -x
-			zip -r "docker-buildx-plugin-${DOCKER_BUILDX_REF#v}.zip" docker-buildx
-		)
-		;;
-esac
+if [ -d "${BUILDX_DIR}/bin" ]; then
+	mkdir -p "${buildxBuildDir}"
+	case ${TARGETOS} in
+		linux | darwin)
+			cp "${BUILDX_DIR}/bin/${targetPair}/buildx" "${buildxBuildDir}/docker-buildx"
+			;;
+		windows)
+			cp "${BUILDX_DIR}/bin/${targetPair}/buildx.exe" "${buildxBuildDir}/docker-buildx.exe"
+			;;
+	esac
+	# package buildx
+	case ${TARGETOS} in
+		linux | darwin)
+			(
+				set -x
+				tar -C "${buildDir}" -c -z -f "${buildDir}/docker-buildx-plugin-${DOCKER_BUILDX_REF#v}.tgz" docker-buildx
+			)
+			;;
+		windows)
+			(
+				cd "${buildDir}"
+				set -x
+				zip -r "docker-buildx-plugin-${DOCKER_BUILDX_REF#v}.zip" docker-buildx
+			)
+			;;
+	esac
+fi
+
+# compose
+if [ -d "${COMPOSE_DIR}/bin" ]; then
+	mkdir -p "${composeBuildDir}"
+	composeTargetPair="${TARGETOS}"
+	case ${TARGETARCH} in
+		amd64)
+			composeTargetPair="${composeTargetPair}-x86_64"
+			;;
+		arm64)
+			composeTargetPair="${composeTargetPair}-aarch64"
+			;;
+		*)
+			composeTargetPair="${composeTargetPair}-${TARGETARCH}"
+			;;
+	esac
+	if [ -n "$TARGETVARIANT" ]; then
+		composeTargetPair="${composeTargetPair}${TARGETVARIANT}"
+	fi
+	case ${TARGETOS} in
+		linux | darwin)
+			cp "${COMPOSE_DIR}/bin/docker-compose-${composeTargetPair}" "${composeBuildDir}/docker-compose"
+			;;
+		windows)
+			cp "${COMPOSE_DIR}/bin/docker-compose-${composeTargetPair}.exe" "${composeBuildDir}/docker-compose.exe"
+			;;
+	esac
+	# package compose
+	case ${TARGETOS} in
+		linux | darwin)
+			(
+				set -x
+				tar -C "${buildDir}" -c -z -f "${buildDir}/docker-compose-plugin-${DOCKER_COMPOSE_REF#v}.tgz" docker-compose
+			)
+			;;
+		windows)
+			(
+				cd "${buildDir}"
+				set -x
+				zip -r "docker-compose-plugin-${DOCKER_COMPOSE_REF#v}.zip" docker-compose
+			)
+			;;
+	esac
+fi
+
+# scan
+if [ -d "${SCAN_DIR}/dist" ]; then
+	mkdir -p "${scanBuildDir}"
+	case ${TARGETOS} in
+		linux | darwin)
+			cp "${SCAN_DIR}/dist/docker-scan_${TARGETOS}_${TARGETARCH}" "${scanBuildDir}/docker-scan"
+			;;
+		windows)
+			cp "${SCAN_DIR}/dist/docker-scan_${TARGETOS}_${TARGETARCH}.exe" "${scanBuildDir}/docker-scan.exe"
+			;;
+	esac
+	# package compose
+	case ${TARGETOS} in
+		linux | darwin)
+			(
+				set -x
+				tar -C "${buildDir}" -c -z -f "${buildDir}/docker-scan-plugin-${DOCKER_SCAN_REF#v}.tgz" docker-scan
+			)
+			;;
+		windows)
+			(
+				cd "${buildDir}"
+				set -x
+				zip -r "docker-scan-plugin-${DOCKER_SCAN_REF#v}.zip" docker-scan
+			)
+			;;
+	esac
+fi
 
 # create bundle
 (