Skip to content

Commit 96434d8

Browse files
committed
Upgrade console specifically to fix a race condition
@sipsma's fix is in containerd 1.3.3, but since containerd is consuming the console package from vendor/, we need to manually upgrade the indirect dependency. containerd/console#34 Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent a23055b commit 96434d8

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require (
44
github.com/Microsoft/go-winio v0.4.14 // indirect
55
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
66
github.com/containerd/cgroups v0.0.0-20181105182409-82cb49fc1779 // indirect
7-
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 // indirect
7+
github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d // indirect
88
github.com/containerd/containerd v1.3.3
99
github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac // indirect
1010
github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c
@@ -44,7 +44,7 @@ require (
4444
github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf
4545
go.etcd.io/bbolt v1.3.1-etcd.8 // indirect
4646
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
47-
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
47+
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e
4848
google.golang.org/genproto v0.0.0-20181109154231-b5d43981345b // indirect
4949
google.golang.org/grpc v1.21.0
5050
gotest.tools v2.2.0+incompatible // indirect

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7
2121
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
2222
github.com/containerd/cgroups v0.0.0-20181105182409-82cb49fc1779 h1:j1IsLW6/hNZPIyBH1v0hhEeB1WXE2ffhHaqSuXhgknY=
2323
github.com/containerd/cgroups v0.0.0-20181105182409-82cb49fc1779/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI=
24-
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 h1:WMpHmC6AxwWb9hMqhudkqG7A/p14KiMnl6d3r1iUMjU=
25-
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
24+
github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d h1:VuiIRfgJ2M3vYEU0F6E5lg3+V0l9YpbGQr3jpZor5fo=
25+
github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=
2626
github.com/containerd/containerd v1.3.3 h1:LoIzb5y9x5l8VKAlyrbusNPXqBY0+kviRloxFUMFwKc=
2727
github.com/containerd/containerd v1.3.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
2828
github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac h1:PThQaO4yCvJzJBUW1XoFQxLotWRhvX2fgljJX8yrhFI=
@@ -231,6 +231,8 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qd
231231
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
232232
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
233233
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
234+
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e h1:N7DeIrjYszNmSW409R3frPPwglRwMkXSBzwVbkOjLLA=
235+
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
234236
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
235237
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
236238
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

0 commit comments

Comments
 (0)