diff --git a/Dockerfile b/Dockerfile index 5872b12af3..035f624960 100644 --- a/Dockerfile +++ b/Dockerfile @@ -129,7 +129,7 @@ RUN rm -vf /charts/*.sh /charts/*.md # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host FROM rancher/k3s:v1.19.7-k3s1 AS k3s -FROM rancher/hardened-containerd:v1.4.3-k3s2 AS containerd +FROM rancher/hardened-containerd:v1.4.3-k3s3 AS containerd FROM rancher/hardened-crictl:v1.19.0 AS crictl FROM rancher/hardened-runc:v1.0.0-rc92 AS runc diff --git a/go.mod b/go.mod index 7b5c67c407..8245ddb41e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.15 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.9 github.com/benmoss/go-powershell => github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373 - github.com/containerd/containerd => github.com/k3s-io/containerd v1.4.3-k3s2 + github.com/containerd/containerd => github.com/k3s-io/containerd v1.4.3-k3s3 github.com/containerd/cri => github.com/k3s-io/cri v1.4.0-k3s.2 // k3s-release/1.4 github.com/coreos/flannel => github.com/rancher/flannel v0.12.0-k3s1 github.com/docker/distribution => github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible diff --git a/go.sum b/go.sum index 46e31116f8..d62d82214a 100644 --- a/go.sum +++ b/go.sum @@ -474,8 +474,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/k3s-io/containerd v1.4.3-k3s2 h1:NtoE6p3O+oAFAt+TmSXxOwGwECGds1CgKcX3Q9Zg4aA= -github.com/k3s-io/containerd v1.4.3-k3s2/go.mod h1:qHmUrsocqXRZQBvPKgoYfsBDfZ/tCtPta97L+VXqbak= +github.com/k3s-io/containerd v1.4.3-k3s3 h1:cCczsk6P0KYYnFuh4FauXNMDcNl2LmDilCD6igR71WU= +github.com/k3s-io/containerd v1.4.3-k3s3/go.mod h1:qHmUrsocqXRZQBvPKgoYfsBDfZ/tCtPta97L+VXqbak= github.com/k3s-io/cri v1.4.0-k3s.2/go.mod h1:fGPUUHMKQik/vIegSe05DtX/m4miovdtvVLqRUFAkK0= github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea h1:7cwby0GoNAi8IsVrT0q+JfQpB6V76ZaEGhj6qts/mvU= github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=