From 956b75eae08e529ff066d5cbd0bc5db770595253 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 3 Dec 2024 03:58:49 +0000 Subject: [PATCH] Bump containerd for image rewrite fix Signed-off-by: Brad Davidson --- Dockerfile | 2 +- Dockerfile.windows | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f2f321796..441de69a5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -118,7 +118,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml # 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/hardened-kubernetes:v1.28.15-rke2r1-build20241023 AS kubernetes -FROM rancher/hardened-containerd:v1.7.23-k3s1-build20241106 AS containerd +FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd FROM rancher/hardened-crictl:v1.28.0-build20241008 AS crictl FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc diff --git a/Dockerfile.windows b/Dockerfile.windows index 1ba70e510e..8a0365b586 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -38,7 +38,7 @@ RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/ins WORKDIR /source # End Dapper stuff -FROM --platform=$BUILDPLATFORM rancher/hardened-containerd:v1.7.23-k3s1-build20241106-amd64-windows AS containerd +FROM --platform=$BUILDPLATFORM rancher/hardened-containerd:v1.7.23-k3s2-build20241203-amd64-windows AS containerd FROM build as windows-runtime-collect ARG KUBERNETES_VERSION=dev