Skip to content

[master] compose: use updated makefile#748

Merged
thaJeztah merged 1 commit intodocker:masterfrom
thaJeztah:update_compose_build
Aug 26, 2022
Merged

[master] compose: use updated makefile#748
thaJeztah merged 1 commit intodocker:masterfrom
thaJeztah:update_compose_build

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah force-pushed the update_compose_build branch from cdfb3b5 to 56ef277 Compare August 23, 2022 23:12
@thaJeztah thaJeztah force-pushed the update_compose_build branch from 56ef277 to 7f3ce09 Compare August 24, 2022 18:34
@thaJeztah thaJeztah changed the title compose: use updated makefile [master] compose: use updated makefile Aug 24, 2022
@thaJeztah
Copy link
Member Author

Hm... what did I mess up? Previous test before the compose PR was merged worked; wondering what changed;

make[2]: Leaving directory '/root/build-deb/cli'
# Build buildx plugin
cd /go/src/github.com/docker/buildx \
&& mkdir -p /usr/libexec/docker/cli-plugins/ \
&& CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor -o /usr/libexec/docker/cli-plugins/docker-buildx -ldflags "-X github.com/docker/buildx/version.Version=v0.9.1 -X github.com/docker/buildx/version.Revision= -X github.com/docker/buildx/version.Package=github.com/docker/buildx" ./cmd/buildx
# Build the compose plugin
cd /go/src/github.com/docker/compose \
&& make VERSION=v2.10.1 DESTDIR=/usr/libexec/docker/cli-plugins build
make[2]: docker: No such file or directory
make[2]: Entering directory '/root/build-deb/compose'
Makefile:22: *** recipe commences before first target.  Stop.
make[2]: Leaving directory '/root/build-deb/compose'
make[1]: Leaving directory '/root/build-deb'

@thaJeztah
Copy link
Member Author

OOOOH, 🤦 they didn't merge it; I thought it was in v2.10.1; docker/compose#9776

@thaJeztah thaJeztah force-pushed the update_compose_build branch from 7f3ce09 to 1991d4b Compare August 26, 2022 20:27
@thaJeztah
Copy link
Member Author

Trying again, this time with #754 😄

crazy-max
crazy-max previously approved these changes Aug 26, 2022
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 <github@gone.nl>
@thaJeztah thaJeztah force-pushed the update_compose_build branch from 1991d4b to b0621bd Compare August 26, 2022 21:46
@thaJeztah thaJeztah marked this pull request as ready for review August 26, 2022 21:49
@thaJeztah thaJeztah requested a review from crazy-max August 26, 2022 21:49
Copy link
Member

@crazy-max crazy-max left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah merged commit dac1ad3 into docker:master Aug 26, 2022
@thaJeztah thaJeztah deleted the update_compose_build branch August 26, 2022 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants