Skip to content

[master] compose: use updated makefile #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 1 commit into from
Aug 26, 2022
Merged

[master] compose: use updated makefile #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions deb/common/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,7 @@ override_dh_auto_build:

# Build the compose plugin
cd /go/src/github.com/docker/compose \
&& GO111MODULE=on go mod download \
Comment thread
thaJeztah marked this conversation as resolved.
&& 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
Expand Down
9 changes: 1 addition & 8 deletions rpm/SPECS/docker-compose-plugin.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down