From 1f7ef3b65052bb90308b237dc8dc823cff3220e6 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Mon, 24 Feb 2025 12:14:14 +0200 Subject: [PATCH] update containerd-dev deps Signed-off-by: Avi Deitcher --- pkg/containerd/Dockerfile | 4 ++-- pkg/init/Dockerfile | 2 +- test/pkg/containerd/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index c8607a203..a813f8f69 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,12 +4,12 @@ FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a as alpine RUN apk add tzdata binutils RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd -FROM linuxkit/containerd-dev:6bcd306acd17006695406edc0cc6b5111a601799 as containerd-dev +FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e as containerd-dev FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=containerd-dev /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/ +COPY --from=containerd-dev /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim-runc-v2 /usr/bin/ COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime COPY --from=alpine /etc/init.d/ /etc/init.d/ COPY etc etc/ diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 19c03d299..8ebc07097 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:6bcd306acd17006695406edc0cc6b5111a601799 AS containerd-dev +FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e AS containerd-dev FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 641e5f277..bc407daa1 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:6bcd306acd17006695406edc0cc6b5111a601799 as containerd-dev +FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e as containerd-dev FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs)