From 765e46f7ccd7755e8c57d5a204bff1ed19b22aec Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Wed, 31 May 2017 15:08:07 -0700 Subject: [PATCH] Update containerd to cfb82a876ecc11b5ca0977d1733adbe58599088a Signed-off-by: Kenfe-Mickael Laventure --- components/engine/hack/dockerfile/binaries-commits | 2 +- components/engine/vendor.conf | 2 +- .../github.com/containerd/containerd/runtime/container.go | 1 - .../vendor/github.com/containerd/containerd/runtime/process.go | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/components/engine/hack/dockerfile/binaries-commits b/components/engine/hack/dockerfile/binaries-commits index cec6ebbd35..7ceeb3447d 100644 --- a/components/engine/hack/dockerfile/binaries-commits +++ b/components/engine/hack/dockerfile/binaries-commits @@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly RUNC_COMMIT=992a5be178a62e026f4069f443c6164912adbf09 -CONTAINERD_COMMIT=3addd840653146c90a254301d6c3a663c7fd6429 +CONTAINERD_COMMIT=cfb82a876ecc11b5ca0977d1733adbe58599088a TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e VNDR_COMMIT=c56e082291115e369f77601f9c071dd0b87c7120 diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 8f15435566..e9940c2bf8 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -103,7 +103,7 @@ google.golang.org/genproto b3e7c2fb04031add52c4817f53f43757ccbf9c18 github.com/docker/docker-credential-helpers v0.5.0 # containerd -github.com/containerd/containerd 3addd840653146c90a254301d6c3a663c7fd6429 +github.com/containerd/containerd cfb82a876ecc11b5ca0977d1733adbe58599088a github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4 # cluster diff --git a/components/engine/vendor/github.com/containerd/containerd/runtime/container.go b/components/engine/vendor/github.com/containerd/containerd/runtime/container.go index 43351cab17..a9677c4ad6 100644 --- a/components/engine/vendor/github.com/containerd/containerd/runtime/container.go +++ b/components/engine/vendor/github.com/containerd/containerd/runtime/container.go @@ -544,7 +544,6 @@ func (c *container) createCmd(ctx context.Context, pid string, cmd *exec.Cmd, p case err := <-ch: return err } - return nil } func hostIDFromMap(id uint32, mp []ocs.LinuxIDMapping) int { diff --git a/components/engine/vendor/github.com/containerd/containerd/runtime/process.go b/components/engine/vendor/github.com/containerd/containerd/runtime/process.go index 22d0192780..2df67d95a9 100644 --- a/components/engine/vendor/github.com/containerd/containerd/runtime/process.go +++ b/components/engine/vendor/github.com/containerd/containerd/runtime/process.go @@ -233,7 +233,7 @@ func (p *process) updateExitStatusFile(status uint32) (uint32, error) { p.stateLock.Lock() p.state = Stopped p.stateLock.Unlock() - err := ioutil.WriteFile(filepath.Join(p.root, ExitStatusFile), []byte(fmt.Sprintf("%u", status)), 0644) + err := ioutil.WriteFile(filepath.Join(p.root, ExitStatusFile), []byte(fmt.Sprintf("%d", status)), 0644) return status, err }