vendor: update git url handling with changes to buildkit#2023
vendor: update git url handling with changes to buildkit#2023jsternberg wants to merge 1 commit intodocker:masterfrom
Conversation
The git ssh url parsing API changed a bit and broke how buildx utilized the API. This updates the affected method with the new method of identifying an SSH url. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
|
The SSH stuff looks fine, but there is quite a large difference in other buildkit changes - maybe might be worth holding off on merging till after the next buildx release? No strong feelings though, LGTM |
|
@jedevc Otoh we already have vendored master so would need to ship with an unreleased version anyway. |
| github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 | ||
| github.com/hashicorp/hcl/v2 v2.8.2 | ||
| github.com/moby/buildkit v0.12.1-0.20230804094609-b49a8873179b | ||
| github.com/moby/buildkit v0.12.1-0.20230822160532-fdacdb78e93a |
There was a problem hiding this comment.
https://github.com/docker/buildx/actions/runs/5979375406/job/16223405923?pr=2023#step:6:229
2023/08/25 18:52:10 buildkitd: flag provided but not defined: -otel-socket-path
2023/08/25 18:52:10 > stopped 2023-08-25 18:52:10.334278273 +0000 UTC m=+5.977077113 exit status 1 1
Related to moby/buildkit@06d51f9
As we now vendor buildkit moby/buildkit@fdacdb7 with this change we need to update
Line 9 in da66629
Probably using this digest as version matching the very same commit: https://github.com/moby/buildkit/actions/runs/5941283562/job/16115090302#step:7:1179
master@sha256:f860a4917188cc9918319dc058a32c968c087ecbd3acda9c4447c650eefa11df
There was a problem hiding this comment.
@jsternberg Can you do the vendor update in a separate commit with the Dockerfile update as well?
|
This and some other changes are going to be part of #2035 so I'm going to close this one and allow that PR to take this one's place. |
4 participants
The git ssh url parsing API changed a bit and broke how buildx utilized
the API. This updates the affected method with the new method of
identifying an SSH url.