Skip to content

Commit

Permalink
vendor containerd
Browse files Browse the repository at this point in the history 
Signed-off-by: Akihiro Suda <[email protected]>
  • Loading branch information
@AkihiroSuda
AkihiroSuda committed Oct 16, 2019
1 parent 170ab6f commit c6641fb
Show file tree
Hide file tree
Showing 22 changed files with 1,047 additions and 67 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58 // indirect
github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601 // indirect
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50
github.com/containerd/containerd v1.3.0
github.com/containerd/containerd v1.4.0-0.20191014053712-acdcf13d5eaf

This comment has been minimized.

Sign in to view

Copy link
@bcmills

bcmills Nov 22, 2019

As noted in golang/go#35787, this version fails version validation in Go 1.13.

I'm curious: how was this version generated? (Was the v1.4.0-0. prefix resolved by a tool, or hand-edited?)

This comment has been minimized.

Sign in to view

Copy link
@AkihiroSuda

AkihiroSuda Nov 23, 2019

Author Member

do you want to open PR?

This comment has been minimized.

Sign in to view

Copy link
@bcmills

bcmills Nov 25, 2019

Not particularly, no. 😉

(Affected users can work around it with a replace directive anyway. I'm more concerned with figuring out whether there is some tooling problem that I should file an issue for somewhere — for example, there used to be a bug in renovatebot that caused it to produce invalid versions.)

This comment has been minimized.

Sign in to view

Copy link
@tonistiigi

tonistiigi Nov 26, 2019

Member

There is no tooling problem, just recent go.mod changes are making it impossible for us to add dependencies to master branch of certain existing well-known projects that use release branches. Adding replace rules doesn't really improve the situation, users will just get a different error, or in worse case build with a wrong dependency version without realizing and get subtle errors on runtime. Atm we have no solution for this problem and can't switch to go1.13 .

I also fail to understand why this "validation" was added and what it is improving, especially when current go.mod doesn't provide any alternatives for working with projects with release branches. The added validation for date seems harmless and I'm not against that part.
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6
github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c // indirect
github.com/containerd/go-cni v0.0.0-20190813230227-49fbd9b210f3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLE
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 h1:WMpHmC6AxwWb9hMqhudkqG7A/p14KiMnl6d3r1iUMjU=
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
github.com/containerd/containerd v1.2.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
github.com/containerd/containerd v1.4.0-0.20191014053712-acdcf13d5eaf h1:phUfu9w7+g1Vp149t3FThX2BmW+DkKkHj613PzZrQuU=
github.com/containerd/containerd v1.4.0-0.20191014053712-acdcf13d5eaf/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
github.com/containerd/continuity v0.0.0-20181001140422-bd77b46c8352/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 h1:NmTXa/uVnDyp0TY5MKi197+3HWcnYWfnHGyaFthlnGw=
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
Expand Down
6 changes: 3 additions & 3 deletions vendor/github.com/containerd/containerd/.travis.yml
View file

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

16 changes: 12 additions & 4 deletions vendor/github.com/containerd/containerd/Makefile
View file

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

28 changes: 28 additions & 0 deletions vendor/github.com/containerd/containerd/README.md
View file

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/containerd/containerd/containerd.service
View file

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/containerd/containerd/images/archive/exporter.go
View file

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/containerd/containerd/images/archive/reference.go
View file

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

12 changes: 10 additions & 2 deletions vendor/github.com/containerd/containerd/lease.go
View file

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

16 changes: 15 additions & 1 deletion vendor/github.com/containerd/containerd/oci/spec_opts.go
View file

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

57 changes: 57 additions & 0 deletions vendor/github.com/containerd/containerd/oci/spec_opts_linux.go
View file

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

57 changes: 57 additions & 0 deletions vendor/github.com/containerd/containerd/oci/spec_opts_unix.go
View file

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

7 changes: 7 additions & 0 deletions vendor/github.com/containerd/containerd/oci/spec_opts_windows.go
View file

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

Loading

0 comments on commit c6641fb

Please sign in to comment.