Skip to content
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.

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

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

Merged
merged 1 commit into from
Dec 19, 2023

Conversation

laurazard
Copy link
Contributor

@laurazard laurazard commented Dec 18, 2023

see: docker/cli@70216b6

supersedes/closes #11271

What I did

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

Related issue

make

GO111MODULE=on go build  -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: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/store.go:74:12: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/store.go:75:23: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/metadatastore.go:43:58: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/metadatastore.go:48:22: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod)
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/cli/context/store/metadatastore.go:80:30: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod)
# github.com/docker/cli/templates
../../../../../pkg/mod/github.com/docker/cli@v25.0.0-beta.2+incompatible/templates/templates.go:13:17: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.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: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod)

(and more!)

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

Screenshot 2023-12-18 at 17 18 12

@laurazard laurazard added the dependencies Pull requests that update a dependency file label Dec 18, 2023
@laurazard laurazard force-pushed the update-cli-version-go branch from df306dd to 7d5a1e9 Compare December 18, 2023 17:22
Copy link
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

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

LGTM

@laurazard laurazard self-assigned this Dec 18, 2023
@laurazard laurazard force-pushed the update-cli-version-go branch from 7d5a1e9 to 34e955c Compare December 18, 2023 17:33
Copy link
Contributor

@ndeloof ndeloof left a comment

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
Contributor

ndeloof commented Dec 18, 2023

supersede #11271

@laurazard laurazard force-pushed the update-cli-version-go branch from 34e955c to 25f33e3 Compare December 18, 2023 17:37
@laurazard
Copy link
Contributor Author

mocks will need to be updated as well

Thanks! Just pushed with updated mocks.

@glours glours enabled auto-merge December 18, 2023 17:39
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

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)

@laurazard laurazard force-pushed the update-cli-version-go branch from 25f33e3 to d04c2f7 Compare December 18, 2023 18:26
@@ -20,7 +20,7 @@ import (
"context"

"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
Contributor Author

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
Member

Choose a reason for hiding this comment

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

😩😫😖😣

@laurazard laurazard force-pushed the update-cli-version-go branch 2 times, most recently from 4b78cf4 to 5461959 Compare December 18, 2023 18:31
@laurazard
Copy link
Contributor Author

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
Contributor Author

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

@thaJeztah
Copy link
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
Member

@thaJeztah
Copy link
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

@laurazard laurazard force-pushed the update-cli-version-go branch from 7fd7d92 to 7781b7c Compare December 19, 2023 14:15
@laurazard
Copy link
Contributor Author

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:main Dec 19, 2023
24 checks passed
@laurazard
Copy link
Contributor Author

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

@glours
Copy link
Contributor

glours commented Dec 19, 2023

@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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants