Skip to content

Conversation

@glours
Copy link
Contributor

@glours glours commented Sep 21, 2023

@glours glours force-pushed the bump-compose-2.22.0 branch from 714019a to 5e45297 Compare September 22, 2023 14:43
@glours glours requested a review from a team September 22, 2023 14:43
@glours glours self-assigned this Sep 22, 2023
@glours glours force-pushed the bump-compose-2.22.0 branch from 5e45297 to 10b66c2 Compare September 22, 2023 15:00
sam-thibault
sam-thibault previously approved these changes Sep 24, 2023
@neersighted
Copy link
Member

Copying from Slack:

We have legit CI failures here as Compose now requires Go 1.21; this is blocked until either:

  • We push a version that uses a separate Go compiler for Compose (I'd be okay with this)
  • All other projects (e.g. CLI, Engine, buildx) compile with Go 1.21

Since the second option will likely happen soon (read: days to weeks), @glours expressed he's fine with waiting to get this in.

deb/common/rules Outdated
# 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
Copy link
Member

Choose a reason for hiding this comment

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

This probably won't work, because both deb and rpm build-tools don't / can't use docker; they're plain make targets (but may be running inside a docker container)

Signed-off-by: Guillaume Lours <[email protected]>
@glours glours force-pushed the bump-compose-2.22.0 branch from b38ea1d to 3e54ed5 Compare October 12, 2023 10:02
@thaJeztah
Copy link
Member

oh, LOL, I did a rebase earlier in ca you still wanted to look at a custom option; #953

Let's merge this one

@thaJeztah thaJeztah changed the title bump compose version to v2.22.0 [master] bump compose version to v2.22.0 Oct 12, 2023
Copy link
Member

@thaJeztah thaJeztah 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 f0e566d into docker:master Oct 12, 2023
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.

4 participants