From da5fefe094ae2ffa793f4bd252f6348a877f5acf Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Wed, 8 Jan 2025 20:53:50 +0200 Subject: [PATCH] Update use of tools to latest Signed-off-by: Avi Deitcher --- pkg/containerd/Dockerfile | 2 +- pkg/init/Dockerfile | 2 +- src/cmd/linuxkit/moby/build/images.yaml | 16 ++++++++-------- test/pkg/containerd/Dockerfile | 2 +- tools/mkimage-iso-efi-initrd/Dockerfile | 2 +- tools/mkimage-iso-efi/Dockerfile | 2 +- tools/mkimage-qcow2-efi/Dockerfile | 2 +- tools/mkimage-raw-efi/Dockerfile | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 8da0597fe..a18adfa95 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:3fb2ec0c94ed30171bb04100f568bba2ebb648a9 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:a895ff37d0838ca3315b2ea120bcb81bbbaba49a as containerd-dev +FROM linuxkit/containerd-dev:cd0ccbbe0296488c243d6bca97f7d5f94268e8ab as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 39c154956..9ddb2312a 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:31d68c2ba04cb4b256ee1facebe5f7285989cf10 AS containerd-dev +FROM linuxkit/containerd-dev:cd0ccbbe0296488c243d6bca97f7d5f94268e8ab AS containerd-dev FROM linuxkit/alpine:3fb2ec0c94ed30171bb04100f568bba2ebb648a9 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers diff --git a/src/cmd/linuxkit/moby/build/images.yaml b/src/cmd/linuxkit/moby/build/images.yaml index b0491fa6e..c06c50741 100644 --- a/src/cmd/linuxkit/moby/build/images.yaml +++ b/src/cmd/linuxkit/moby/build/images.yaml @@ -1,12 +1,12 @@ - iso: linuxkit/mkimage-iso:b48f08e3139f61ff6db23616fdab8176359c8476 - iso-bios: linuxkit/mkimage-iso-bios:507b4c47691ac1760d788dfb66248c7100ae6f34 - iso-efi: linuxkit/mkimage-iso-efi:17d263e318864b4f2349827659b842a1dc50717d - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:b395767abae91cb3b1cb3b7b85ce260dbb12272e - raw-bios: linuxkit/mkimage-raw-bios:43ccb56580e0ab0d5bd0932273ca70a7c6a3d62a - raw-efi: linuxkit/mkimage-raw-efi:ea9263c6b5fbfa59f656f254a2da356087688f45 - squashfs: linuxkit/mkimage-squashfs:0438bf54831e9eb9755b79a7704173aed5fe35bf + iso: linuxkit/mkimage-iso:fbeb844a76afc0c2358d68328b091b844a402215 + iso-bios: linuxkit/mkimage-iso-bios:a7d9059eeb586c146dabdef509aad8104bf398d7 + iso-efi: linuxkit/mkimage-iso-efi:712bfe3ce9ae24fe66e2acd752098183bb220a68 + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:9d7427bcd02e6ba2e8b174e3d43e431223449b3f + raw-bios: linuxkit/mkimage-raw-bios:e239792b5b4c4c70734cc3934925fbddf01ab71d + raw-efi: linuxkit/mkimage-raw-efi:feadb9a9d3e1057d247399eb007ed28817e73ac7 + squashfs: linuxkit/mkimage-squashfs:8acd80dfc5d22fef194e8535730ac750a49bdff2 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:8f9e54f08865cf48dc09d5cadfc6e8d6d99768ce + qcow2-efi: linuxkit/mkimage-qcow2-efi:8aba8528831d81a90be312843325778ac5748179 vhd: linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21 dynamic-vhd: linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533 vmdk: linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 018e11f55..01cae0a17 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:31d68c2ba04cb4b256ee1facebe5f7285989cf10 as containerd-dev +FROM linuxkit/containerd-dev:cd0ccbbe0296488c243d6bca97f7d5f94268e8ab as containerd-dev FROM linuxkit/alpine:3fb2ec0c94ed30171bb04100f568bba2ebb648a9 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) diff --git a/tools/mkimage-iso-efi-initrd/Dockerfile b/tools/mkimage-iso-efi-initrd/Dockerfile index f04f6ac80..0494f9a3c 100644 --- a/tools/mkimage-iso-efi-initrd/Dockerfile +++ b/tools/mkimage-iso-efi-initrd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/grub:9b36ab2ca67e9cdc2faf008278cc4bb8f981350b AS grub +FROM linuxkit/grub:b498542e496dc2301ac1718d9096c2b26f041635 AS grub FROM linuxkit/alpine:5ac048802293564a50414394e1b9896eac528e7d AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile index 893f1a4d4..377a8242f 100644 --- a/tools/mkimage-iso-efi/Dockerfile +++ b/tools/mkimage-iso-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/grub:9b36ab2ca67e9cdc2faf008278cc4bb8f981350b AS grub +FROM linuxkit/grub:b498542e496dc2301ac1718d9096c2b26f041635 AS grub FROM linuxkit/alpine:5ac048802293564a50414394e1b9896eac528e7d AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ diff --git a/tools/mkimage-qcow2-efi/Dockerfile b/tools/mkimage-qcow2-efi/Dockerfile index 0e8be1029..5d1904b56 100644 --- a/tools/mkimage-qcow2-efi/Dockerfile +++ b/tools/mkimage-qcow2-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/grub:9b36ab2ca67e9cdc2faf008278cc4bb8f981350b AS grub +FROM linuxkit/grub:b498542e496dc2301ac1718d9096c2b26f041635 AS grub FROM linuxkit/alpine:5ac048802293564a50414394e1b9896eac528e7d AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ diff --git a/tools/mkimage-raw-efi/Dockerfile b/tools/mkimage-raw-efi/Dockerfile index f615bdb50..f90250203 100644 --- a/tools/mkimage-raw-efi/Dockerfile +++ b/tools/mkimage-raw-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/grub:9b36ab2ca67e9cdc2faf008278cc4bb8f981350b AS grub +FROM linuxkit/grub:b498542e496dc2301ac1718d9096c2b26f041635 AS grub FROM linuxkit/alpine:5ac048802293564a50414394e1b9896eac528e7d AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/