p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31278 from vieux/bump_containerd

Browse Source 
update containerd to 665e84e6c28653a9c29a6db601636a92d46896f3
Upstream-commit: 07ca9109a3c7b95389a60c965fd14185cd0d81fc
Component: engine
This commit is contained in:
Brian Goff
2017-02-23 09:25:08 -05:00
committed by GitHub
parent e252f084ae 14bd277aab
commit 3294f7201d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/hack/dockerfile/binaries-commits
View File

@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
RUNC_COMMIT=a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
CONTAINERD_COMMIT=78fb8f45890a601e0fd9051cf9f9f74923e950fd
CONTAINERD_COMMIT=665e84e6c28653a9c29a6db601636a92d46896f3
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
VNDR_COMMIT=f56bd4504b4fad07a357913687fb652ee54bb3b0

2
components/engine/vendor.conf
View File

@ -100,7 +100,7 @@ google.golang.org/genproto b3e7c2fb04031add52c4817f53f43757ccbf9c18
github.com/docker/docker-credential-helpers f72c04f1d8e71959a6d103f808c50ccbad79b9fd
# containerd
github.com/docker/containerd 78fb8f45890a601e0fd9051cf9f9f74923e950fd
github.com/docker/containerd 665e84e6c28653a9c29a6db601636a92d46896f3
github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4
# cluster