Skip to content

Commit

Permalink
add specific golang version for Compose
Browse files Browse the repository at this point in the history
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
  • Loading branch information
glours committed Oct 10, 2023
1 parent 10b66c2 commit c52bb28
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion deb/common/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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)"; \
Expand Down
1 change: 1 addition & 0 deletions rpm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion rpm/SPECS/docker-compose-plugin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c52bb28

Please sign in to comment.