-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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
Conversation
df306dd
to
7d5a1e9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
7d5a1e9
to
34e955c
Compare
There was a problem hiding this 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
supersede #11271 |
34e955c
to
25f33e3
Compare
Thanks! Just pushed with updated mocks. |
There was a problem hiding this 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)
25f33e3
to
d04c2f7
Compare
@@ -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" |
There was a problem hiding this comment.
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 🥲
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😩😫😖😣
4b78cf4
to
5461959
Compare
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? |
For example's sake, that would look like this: 7fd7d92 |
DOH! Didn't realise / forgot that was only in the v0.12 branch; we should forward-port that to master. |
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 <[email protected]>
7fd7d92
to
7781b7c
Compare
Made docker/buildx#2170 to be able to build Compose with the latest from Buildx and Buildkit, so now this works! (without downgrading anything) |
Ah it still had automerge enabled 😅 Please make sure it looks good, ended up just upgrading Buildkit and Buildx dependencies. |
@laurazard yes my bad, I forgot to remove it after the first failure 😞 |
see: docker/cli@70216b6
supersedes/closes #11271
What I did
bump
github.com/docker/cli
version to docker/cli@70216b6Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did