Merge pull request #471 from ncopa/containerd-1.4.2

Bump containerd to 1.4.2
k0sproject · Nov 30, 2020 · a9cb3f3 · a9cb3f3
2 parents 6d41c42 + 40fc2f0
commit a9cb3f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/embedded-bins/Makefile b/embedded-bins/Makefile
@@ -1,6 +1,6 @@
 
 runc_version = 1.0.0-rc92
-containerd_version = 1.4.1
+containerd_version = 1.4.2
 kubernetes_version = 1.19.4
 kine_version = 0.5.1
 etcd_version = 3.4.13

diff --git a/embedded-bins/containerd/Dockerfile b/embedded-bins/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13-alpine AS build
+FROM golang:1.15-alpine AS build
 
 ARG VERSION
 ENV GOPATH=/go