From ccfc6d532c49b820651c3a57cbdfa557e35550fc Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 6 Mar 2025 09:40:09 +0200 Subject: [PATCH] update containerd-dev dependencies Signed-off-by: Avi Deitcher --- pkg/containerd/Dockerfile | 2 +- pkg/init/Dockerfile | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/pkg/containerd/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index a813f8f69..21ce98fa9 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ 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:dcb484003086d12dc0458793375f3769553f330e as containerd-dev +FROM linuxkit/containerd-dev:fb4bf37a114ce1eb8a2c4ed3db91a50301805e2c as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 8ebc07097..0c9b6abcf 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e AS containerd-dev +FROM linuxkit/containerd-dev:fb4bf37a114ce1eb8a2c4ed3db91a50301805e2c 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/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 133b82823..99e959c74 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -18,6 +18,6 @@ onboot: image: linuxkit/mount:cb8caa72248f7082fc2074ce843d53cdc15df04a command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:0dfd29a79418cdff3e6228b4fa1b6594524c4717 + image: linuxkit/test-containerd:ff8a62cbe38b24954d45a3466168f54d7eee20d1 - name: poweroff image: linuxkit/poweroff:91a23d43c403e200102b7512d8de95f89c86565c diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index e14db0755..b12aec2cb 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e as containerd-dev +FROM linuxkit/containerd-dev:fb4bf37a114ce1eb8a2c4ed3db91a50301805e2c 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)