Skip to content

Commit dac1ad3

Browse files
authored
Merge pull request #748 from thaJeztah/update_compose_build
[master] compose: use updated makefile
2 parents ab55e16 + b0621bd commit dac1ad3

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

deb/common/rules

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,7 @@ override_dh_auto_build:
2323

2424
# Build the compose plugin
2525
cd /go/src/github.com/docker/compose \
26-
&& GO111MODULE=on go mod download \
27-
&& mkdir -p /usr/libexec/docker/cli-plugins/ \
28-
&& GO111MODULE=on \
29-
CGO_ENABLED=0 \
30-
go build \
31-
-trimpath \
32-
-ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=$(COMPOSE_VERSION)" \
33-
-o "/usr/libexec/docker/cli-plugins/docker-compose" \
34-
./cmd
26+
&& make VERSION=$(COMPOSE_VERSION) DESTDIR=/usr/libexec/docker/cli-plugins build
3527

3628
# Build the scan-plugin
3729
# TODO change once we support scan-plugin on other architectures

rpm/SPECS/docker-compose-plugin.spec

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,7 @@ Docker Compose V1 ('docker-compose').
3535

3636
%build
3737
pushd ${RPM_BUILD_DIR}/src/compose
38-
GO111MODULE=on go mod download
39-
GO111MODULE=on \
40-
CGO_ENABLED=0 \
41-
go build \
42-
-trimpath \
43-
-ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=%{_compose_version}" \
44-
-o "bin/docker-compose" \
45-
./cmd
38+
make VERSION=%{_compose_version} DESTDIR=./bin build
4639
popd
4740

4841
%check

0 commit comments

Comments
 (0)