Skip to content

Support new tar option for oci+docker exporters#1420

Merged
crazy-max merged 3 commits intodocker:masterfrom
jedevc:oci-tar
Nov 29, 2022
Merged

Support new tar option for oci+docker exporters#1420
crazy-max merged 3 commits intodocker:masterfrom
jedevc:oci-tar

Conversation

@jedevc
Copy link
Collaborator

@jedevc jedevc commented Nov 22, 2022

⬆️ Follow-up to moby/buildkit#3162

moby/buildkit#3162 requires changes to buildx, as it requires improved validation in the CLI to correctly determine whether it should pass a file or a directory to the buildkit server. Additionally, we need to update the buildkit vendored packages for the updated client-side validation.

@jedevc jedevc requested a review from tonistiigi November 22, 2022 14:47
Copy link
Member

@crazy-max crazy-max left a comment

Choose a reason for hiding this comment

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

Replace directive for moby needs to match buildkit one:

buildx/go.mod

Line 171 in 60e2029

github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220720171342-a60b458179aa+incompatible // 22.06 branch (v22.06-dev)

replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221006005007-99aa9bb766b5+incompatible // 22.06 branch (v22.06-dev)

Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
@crazy-max
Copy link
Member

Get this one in, as follow-up we should have unit tests for this package: https://github.com/docker/buildx/blob/master/util/buildflags

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.

3 participants