From a106e4265747f9ad71a27d8f2dba11fa511aff49 Mon Sep 17 00:00:00 2001 From: Andrew Rynhard Date: Sun, 14 Apr 2019 10:25:03 -0700 Subject: [PATCH] feat: upgrade containerd to v1.2.6 (#532) Signed-off-by: Andrew Rynhard --- Dockerfile | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47a7a1fad..c379e325e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -162,7 +162,7 @@ RUN mkdir -p $GOPATH/src/github.com/containerd \ && cd $GOPATH/src/github.com/containerd \ && git clone https://github.com/containerd/containerd.git \ && cd $GOPATH/src/github.com/containerd/containerd \ - && git checkout v1.2.5 + && git checkout v1.2.6 RUN cd $GOPATH/src/github.com/containerd/containerd \ && make binaries BUILDTAGS=no_btrfs \ && cp bin/containerd /rootfs/bin \ diff --git a/go.mod b/go.mod index 0fcc363bb..bb9212754 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Microsoft/hcsshim v0.7.0 // indirect github.com/beevik/ntp v0.2.0 github.com/containerd/cgroups v0.0.0-20180905221500-58556f5ad844 - github.com/containerd/containerd v1.2.5 + github.com/containerd/containerd v1.2.6 github.com/containerd/continuity v0.0.0-20181003075958-be9bd761db19 // indirect github.com/containerd/cri v1.11.1 github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260 // indirect diff --git a/go.sum b/go.sum index 8ae95d5f2..e5a06f9f2 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,8 @@ github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NR github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/containerd/cgroups v0.0.0-20180905221500-58556f5ad844 h1:W0F6ErEE8B84VNA5yX3sqNm0z7tivzEtvI/3DMo4Mr4= github.com/containerd/cgroups v0.0.0-20180905221500-58556f5ad844/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= -github.com/containerd/containerd v1.2.5 h1:D+s0XmoswfcRJXgmMMlI1vAblp+LTCftRnEjKsgbFPU= -github.com/containerd/containerd v1.2.5/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.2.6 h1:K38ZSAA9oKSrX3iFNY+4SddZ8hH1TCMCerc8NHfcKBQ= +github.com/containerd/containerd v1.2.6/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/continuity v0.0.0-20181003075958-be9bd761db19 h1:HSgjWPBWohO3kHDPwCPUGSLqJjXCjA7ad5057beR2ZU= github.com/containerd/continuity v0.0.0-20181003075958-be9bd761db19/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/cri v1.11.1 h1:mR8+eNW4zEcbWGTGEpmDd7GzMmK7IMxMSVAZ2aIDKA4=