From b0621bde559156e37044da4d6f5d6f71ec739d9f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 24 Aug 2022 00:53:20 +0200 Subject: [PATCH] compose: use updated makefile compose v2.10.1 comes with an updated Makefile, allowing us again to use the makefile for building as part of the rpm/deb scripts. Signed-off-by: Sebastiaan van Stijn --- deb/common/rules | 10 +--------- rpm/SPECS/docker-compose-plugin.spec | 9 +-------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/deb/common/rules b/deb/common/rules index 5c2b4d160e..b9dbad723b 100755 --- a/deb/common/rules +++ b/deb/common/rules @@ -23,15 +23,7 @@ override_dh_auto_build: # Build the compose plugin cd /go/src/github.com/docker/compose \ - && GO111MODULE=on go mod download \ - && mkdir -p /usr/libexec/docker/cli-plugins/ \ - && GO111MODULE=on \ - CGO_ENABLED=0 \ - go build \ - -trimpath \ - -ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=$(COMPOSE_VERSION)" \ - -o "/usr/libexec/docker/cli-plugins/docker-compose" \ - ./cmd + && make VERSION=$(COMPOSE_VERSION) DESTDIR=/usr/libexec/docker/cli-plugins build # Build the scan-plugin # TODO change once we support scan-plugin on other architectures diff --git a/rpm/SPECS/docker-compose-plugin.spec b/rpm/SPECS/docker-compose-plugin.spec index b269c55f43..097c6cbdbf 100644 --- a/rpm/SPECS/docker-compose-plugin.spec +++ b/rpm/SPECS/docker-compose-plugin.spec @@ -35,14 +35,7 @@ Docker Compose V1 ('docker-compose'). %build pushd ${RPM_BUILD_DIR}/src/compose - GO111MODULE=on go mod download - GO111MODULE=on \ - CGO_ENABLED=0 \ - go build \ - -trimpath \ - -ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=%{_compose_version}" \ - -o "bin/docker-compose" \ - ./cmd + make VERSION=%{_compose_version} DESTDIR=./bin build popd %check