Skip to content

vendor: containerd v1.6.2, buildkit v0.10.0#3485

Merged
thaJeztah merged 5 commits intodocker:masterfrom
thaJeztah:update_vendor
Mar 25, 2022
Merged

vendor: containerd v1.6.2, buildkit v0.10.0#3485
thaJeztah merged 5 commits intodocker:masterfrom
thaJeztah:update_vendor

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Mar 24, 2022

vendor: google.golang.org/grpc v1.44.0

full diff: grpc/grpc-go@v1.38.0...v1.44.0

vendor: github.com/containerd/containerd v1.6.2

full diff: containerd/containerd@v1.5.10...v1.6.2

vendor: github.com/prometheus/procfs v0.7.3

un-pinning the dependency to let go modules resolve the version to use.

full diff: prometheus/procfs@v0.0.11...v0.7.3

vendor: github.com/prometheus/client_golang v1.11.0

un-pin the dependency to let go modules resolve the version

full diff: prometheus/client_golang@v1.6.0...v1.11.0

vendor: github.com/moby/buildkit v0.10.0

full diff: moby/buildkit@9f254e1...v0.10.0

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah
vendor: google.golang.org/grpc v1.44.0
b2cef83 
full diff: grpc/grpc-go@v1.38.0...v1.44.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/containerd/containerd v1.6.2
29f799a 
full diff: containerd/containerd@v1.5.10...v1.6.2

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/prometheus/procfs v0.7.3
7408799 
un-pinning the dependency to let go modules resolve the version to use.

full diff: prometheus/procfs@v0.0.11...v0.7.3

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/prometheus/client_golang v1.11.0
adadd54 
un-pin the dependency to let go modules resolve the version

full diff: prometheus/client_golang@v1.6.0...v1.11.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/moby/buildkit v0.10.0
5f74020 
full diff: moby/buildkit@9f254e1...v0.10.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 21.xx milestone Mar 24, 2022
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Mar 24, 2022 •
edited
Loading

Codecov Report

Merging #3485 (5f74020) into master (0e3c9b2) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3485   +/-   ##
=======================================
  Coverage   59.01%   59.01%           
=======================================
  Files         284      284           
  Lines       23833    23833           
=======================================
  Hits        14066    14066           
  Misses       8908     8908           
  Partials      859      859

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 24, 2022

@rumpl @crazy-max PTAL

@crazy-max
Copy link
Copy Markdown
Member

crazy-max commented Mar 24, 2022 •
edited
Loading

I wonder if the buildkit dependency is still something required here. It looks like we depend on it for only two small pkgs that could be directly integrated here:

cli/cmd/docker/docker.go

Line 18 in 6745f62

"github.com/moby/buildkit/util/appcontext"

cli/cmd/docker/docker.go

Lines 198 to 201 in 6745f62

go func() {
// override SIGTERM handler so we let the plugin shut down first
<-appcontext.Context().Done()
}()

cli/cli/command/image/build/dockerignore.go

Line 8 in a32cd16

"github.com/moby/buildkit/frontend/dockerfile/dockerignore"

cli/cli/command/image/build/dockerignore.go

Line 25 in a32cd16

return dockerignore.ReadAll(f)

The dockerignore one needs more thoughts though (split parser/frontend from buildkit): moby/buildkit#2734 (comment)

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 24, 2022

Yes, I was also looking at some bits for the dockerignore, and for context I want to look at getting rid of pkg/urlutil, which looks like it made its way into other areas where it shouldn't be used (and I think there's equivalents to that in buildkit); https://github.com/moby/moby/tree/babb0c14fd1281b309de46c3481a5bea88b8031d/pkg/urlutil

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 24, 2022

@crazy-max those things ok to do in a follow-up (if possible?)? Looks like we may not be able to resolve them immediately (in this repository), or at least only partial

crazy-max
crazy-max approved these changes Mar 25, 2022
View reviewed changes
Copy link
Copy Markdown
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.

Yes let's think about that in a follow-up

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 25, 2022

Thx!

@thaJeztah thaJeztah merged commit 87b8e57 into docker:master Mar 25, 2022
@thaJeztah thaJeztah deleted the update_vendor branch March 25, 2022 09:13
SpringLeee pushed a commit to SpringLeee/cli that referenced this pull request Mar 27, 2022
@thaJeztah @SpringLeee
Merge pull request docker#3485 from thaJeztah/update_vendor
e4cffb4 
vendor: containerd v1.6.2, buildkit v0.10.0
Signed-off-by: Spring Lee <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crazy-max crazy-max crazy-max approved these changes

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

23.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @codecov-commenter @crazy-max