add specific golang version for Compose

Signed-off-by: Guillaume Lours <[email protected]>

common.mk

@@ -18,6 +18,7 @@ DEFAULT_PRODUCT_LICENSE:=Community Engine
 PACKAGER_NAME?=
 DOCKER_GITCOMMIT:=abcdefg
 GO_VERSION:=1.20.8
+GO_VERSION_COMPOSE:=1.21.2
 PLATFORM=Docker Engine - Community
 SHELL:=/bin/bash
 VERSION?=0.0.1-dev

deb/Makefile

@@ -38,6 +38,7 @@ RUN?=docker run --rm \
 	-e BUILDX_DEB_VERSION=$(word 1, $(GEN_BUILDX_DEB_VER)) \
 	-e BUILDX_GITCOMMIT=$(BUILDX_GITCOMMIT) \
 	-e COMPOSE_VERSION=$(DOCKER_COMPOSE_REF) \
+	-e GO_VERSION_COMPOSE=$(GO_VERSION_COMPOSE) \
 	-e COMPOSE_DEB_VERSION=$(word 1, $(GEN_COMPOSE_DEB_VER)) \
 	-v $(CURDIR)/debbuild/$@:/build \
 	$(RUN_FLAGS) \

deb/common/rules

@@ -33,7 +33,7 @@ override_dh_auto_build:
 
 	# Build the compose plugin
 	cd /go/src/github.com/docker/compose \
-	&& make VERSION=$(COMPOSE_VERSION) DESTDIR=/usr/libexec/docker/cli-plugins build
+	&& make GO_VERSION=$(GO_VERSION_COMPOSE) VERSION=$(COMPOSE_VERSION) DESTDIR=/usr/libexec/docker/cli-plugins build
 
 override_dh_auto_test:
 	ver="$$(engine/bundles/dynbinary-daemon/dockerd --version)"; \

rpm/Makefile

@@ -36,6 +36,7 @@ RPMBUILD_FLAGS?=-ba\
 	--define '_buildx_gitcommit $(BUILDX_GITCOMMIT)' \
 	--define '_compose_rpm_version $(word 1,$(GEN_COMPOSE_RPM_VER))' \
 	--define '_compose_version $(word 4,$(GEN_COMPOSE_RPM_VER))' \
+	--define '_go_version_compose=$(GO_VERSION_COMPOSE)' \
 	$(RPMBUILD_EXTRA_FLAGS) \
 	$(SPECS)
 

rpm/SPECS/docker-compose-plugin.spec

@@ -35,7 +35,7 @@ Docker Compose V1 ('docker-compose').
 
 %build
 pushd ${RPM_BUILD_DIR}/src/compose
-    make VERSION=%{_compose_version} DESTDIR=./bin build
+    make GO_VERSION=%{_go_version_compose} VERSION=%{_compose_version} DESTDIR=./bin build
 popd
 
 %check