Skip to content

deps: update docker/cli to fix go version selection issue - #11283

Merged
glours merged 1 commit into
docker:mainfrom
laurazard:update-cli-version-go
Dec 19, 2023
Merged

deps: update docker/cli to fix go version selection issue#11283
glours merged 1 commit into
docker:mainfrom
laurazard:update-cli-version-go

Conversation

@laurazard

@laurazardlaurazard commented Dec 18, 2023

Copy link
Copy Markdown
Member

see: docker/cli@70216b6

supersedes/closes#11271

What I did

bump github.com/docker/cli version to docker/cli@70216b6

Related issue

makeGO111MODULE=ongobuild-trimpath-tags"e2e"-ldflags"-w -X github.com/docker/compose/v2/internal.Version=v2.24.0-birthday.10-3-g785835b1.m"-o"./bin/build/docker-compose" ./cmd
# github.com/docker/cli/cli/context/store
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/storeconfig.go:6:24: predeclaredanyrequires go1.18orlater (-langwassetto go1.16; checkgo.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/store.go:74:12: predeclaredanyrequiresgo1.18orlater (-langwassetto go1.16; checkgo.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/store.go:75:23: predeclaredanyrequiresgo1.18orlater (-langwassetto go1.16; checkgo.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/metadatastore.go:43:58: predeclaredanyrequires go1.18orlater (-langwassetto go1.16; checkgo.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/metadatastore.go:48:22: predeclaredanyrequires go1.18orlater (-langwassetto go1.16; checkgo.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/metadatastore.go:80:30: predeclaredanyrequires go1.18orlater (-langwassetto go1.16; checkgo.mod)
# github.com/docker/cli/templates
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/templates/templates.go:13:17: predeclaredanyrequires go1.18orlater (-langwassetto go1.16; checkgo.mod)
# github.com/docker/cli/cli/compose/template
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/compose/template/template.go:98:45: predeclaredanyrequiresgo1.18orlater (-langwassetto go1.16; checkgo.mod)
(andmore!)

(not mandatory) A picture of a cute animal, if possible in relation to what you did

Screenshot 2023-12-18 at 17 18 12

@laurazardlaurazard added the dependencies Pull requests that update a dependency file label Dec 18, 2023

@gloursglours left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@laurazardlaurazard self-assigned this Dec 18, 2023

@ndeloofndeloof left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM
mocks will need to be updated as well

@ndeloof

Copy link
Copy Markdown
Contributor

supersede #11271

@laurazard

Copy link
Copy Markdown
MemberAuthor

mocks will need to be updated as well

Thanks! Just pushed with updated mocks.

@glours
glours enabled auto-merge December 18, 2023 17:39

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

we had similar changes on the daemon side as well, but I can update my draft PR to verify those. (if all works out, also will do a new beta)


"go.opentelemetry.io/otel/codes"
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
semconv "go.opentelemetry.io/otel/semconv/v1.19.0"

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Ah OTEL semconv imports my old friend 🥲

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

😩😫😖😣

@laurazard
laurazardforce-pushed the update-cli-version-go branch 2 times, most recently from 4b78cf4 to 5461959CompareDecember 18, 2023 18:31
@laurazard

Copy link
Copy Markdown
MemberAuthor

OTEL things are breaking and I've a headache, so open to ideas 🤦‍♀️ . I could make use of moby/buildkit#4472, but that's only on the v0.12 branch, and we'd have to downgrade Buildkit to v0.11.2 which implies more changes. @milas wdyt?

@laurazard

Copy link
Copy Markdown
MemberAuthor

For example's sake, that would look like this: 7fd7d92

@thaJeztah

Copy link
Copy Markdown
Member

OTEL things are breaking and I've a headache, so open to ideas 🤦‍♀️ . I could make use of moby/buildkit#4472, but that's only on the v0.12 branch

DOH! Didn't realise / forgot that was only in the v0.12 branch; we should forward-port that to master.

@thaJeztah

Copy link
Copy Markdown
Member

@thaJeztah

Copy link
Copy Markdown
Member

I guess updating BuildKit to current master could also work; it's already updated to OTEL 0.45 now; https://github.com/moby/buildkit/blob/bbb6aaccb9aeb856e450c4eb535034507b074254/go.mod#L74-L88

see: docker/cli@70216b6
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
@laurazard

Copy link
Copy Markdown
MemberAuthor

I guess updating BuildKit to current master could also work; it's already updated to OTEL 0.45 now;

Made docker/buildx#2170 to be able to build Compose with the latest from Buildx and Buildkit, so now this works! (without downgrading anything)

@glours
glours merged commit aefc2a1 into docker:mainDec 19, 2023
@laurazard

Copy link
Copy Markdown
MemberAuthor

Ah it still had automerge enabled 😅 Please make sure it looks good, ended up just upgrading Buildkit and Buildx dependencies.

@glours

Copy link
Copy Markdown
Contributor

@laurazard yes my bad, I forgot to remove it after the first failure 😞
We'll check that everything is fine, don't worry

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependenciesPull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@laurazard@ndeloof@thaJeztah@glours