feat: upgrade containerd to v1.2.5 (#463)

Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
This commit is contained in:
Andrew Rynhard 2019-03-24 20:52:27 -07:00 committed by GitHub
parent 2e9a7ec0c5
commit 30774fc3f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -160,7 +160,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.4
&& git checkout v1.2.5
RUN cd $GOPATH/src/github.com/containerd/containerd \
&& make binaries BUILDTAGS=no_btrfs \
&& cp bin/containerd /rootfs/bin \

2
go.mod
View File

@ -7,7 +7,7 @@ require (
github.com/autonomy/dhcp v0.0.0-20190227141242-cedea8519f96
github.com/beevik/ntp v0.2.0
github.com/containerd/cgroups v0.0.0-20180905221500-58556f5ad844
github.com/containerd/containerd v1.2.4
github.com/containerd/containerd v1.2.5
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

4
go.sum
View File

@ -12,8 +12,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.4 h1:qN8LCvw+KA5wVCOnHspD/n2K9cJ34+YOs05qBBWhHiw=
github.com/containerd/containerd v1.2.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
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/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=