浏览代码

Merge pull request #31278 from vieux/bump_containerd

update containerd to 665e84e6c28653a9c29a6db601636a92d46896f3
Brian Goff 8 年之前
父节点
当前提交
07ca9109a3
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      hack/dockerfile/binaries-commits
  2. 1 1
      vendor.conf

+ 1 - 1
hack/dockerfile/binaries-commits

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

+ 1 - 1
vendor.conf

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