Skip to content

vendoring updates (buildkit, compose) #19729

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 2, 2024
Merged

vendoring updates (buildkit, compose) #19729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
799a04f
vendor: github.com/docker/compose/v2 v2.26.1
dvdksn Apr 2, 2024
ad4baa7
vendor: github.com/moby/buildkit 7cd12732690e
dvdksn Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _vendor/github.com/docker/compose/v2/docs/reference/compose_build.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions _vendor/github.com/docker/compose/v2/docs/reference/compose_config.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions _vendor/github.com/docker/compose/v2/docs/reference/compose_run.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 15 additions & 5 deletions _vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions _vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 51 additions & 24 deletions _vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions _vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# github.com/moby/moby v26.0.0+incompatible
# github.com/moby/buildkit v0.13.0
# github.com/docker/buildx v0.13.1
# github.com/moby/buildkit v0.13.0-rc3.0.20240402103816-7cd12732690e
# github.com/docker/buildx v0.0.0-00010101000000-000000000000
# github.com/docker/cli v26.0.0+incompatible
# github.com/docker/compose/v2 v2.26.1
# github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ toolchain go1.21.1
require (
github.com/docker/buildx v0.13.1 // indirect
github.com/docker/cli v26.0.0+incompatible // indirect
github.com/docker/compose/v2 v2.26.1 // indirect
github.com/moby/buildkit v0.13.0 // indirect
github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 // indirect
github.com/moby/buildkit v0.13.1 // indirect
github.com/moby/moby v26.0.0+incompatible // indirect
)

replace (
github.com/docker/buildx => github.com/docker/buildx v0.13.1
github.com/docker/cli => github.com/docker/cli v26.0.0+incompatible
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.25.0
github.com/moby/buildkit => github.com/moby/buildkit v0.13.0-rc3.0.20240308080452-a38011b9f57d
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.26.1
github.com/moby/buildkit => github.com/moby/buildkit v0.13.0-rc3.0.20240402103816-7cd12732690e
github.com/moby/moby => github.com/moby/moby v26.0.0+incompatible
)
Loading