From f92659db51dedd2aab62b12057df63913bd99603 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Fri, 14 Feb 2025 15:07:10 +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/grub/Dockerfile | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 9aca7124e..ed60e5079 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 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:8fe97ddfe55ed40190cdc19e50497289d28a9270 as containerd-dev +FROM linuxkit/containerd-dev:6bcd306acd17006695406edc0cc6b5111a601799 as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index f253ea294..5fdb85163 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:8fe97ddfe55ed40190cdc19e50497289d28a9270 AS containerd-dev +FROM linuxkit/containerd-dev:6bcd306acd17006695406edc0cc6b5111a601799 AS containerd-dev FROM linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 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 790bf8bd8..daffd868c 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:fbc7d7dff99d2a66967d6e2b509941d35213fde3 - iso-bios: linuxkit/mkimage-iso-bios:ff832d8001c34a9ba9c9ba78185d62117516d19c - iso-efi: linuxkit/mkimage-iso-efi:4bff02040897e4177a2220038f4a5a08cd556afd - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:6d087ae7aa61fe6d840e314dcb2d6b7b2a5db1b8 - raw-bios: linuxkit/mkimage-raw-bios:c64318cfc28b39010b05c7cd48673f397c45c8df - raw-efi: linuxkit/mkimage-raw-efi:6d9a9ff0a575f8ba5fcd5bf25feac89d0aa343d0 - squashfs: linuxkit/mkimage-squashfs:d9de62071bed575377e35e944004bcb23c50afab + iso: linuxkit/mkimage-iso:8c45e3a3b5609bcd382a15c4fcd8168a1d5ab663 + iso-bios: linuxkit/mkimage-iso-bios:a3b0fba84cb679c9225e568d3f158c77c9e61d33 + iso-efi: linuxkit/mkimage-iso-efi:8f236be3db79ac1bf1e356efa97860f6c99bc367 + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:fbe42dd74527af8b7b1b804eb3afefcbf9663c67 + raw-bios: linuxkit/mkimage-raw-bios:a11bbe671863a75c68c58e9454d3246ab406567c + raw-efi: linuxkit/mkimage-raw-efi:60415b45ea87afd47bb61ef5409b1320882d7e56 + squashfs: linuxkit/mkimage-squashfs:3433e24dbecc28d1b70469bc36d91c152355841c gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:64e1921dc6074d55d0fa95c2beddef7d153d3eca + qcow2-efi: linuxkit/mkimage-qcow2-efi:203809755424fb601f63700f13f17dc65cef69b5 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 513ed28bb..01a98ac4b 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:8fe97ddfe55ed40190cdc19e50497289d28a9270 as containerd-dev +FROM linuxkit/containerd-dev:6bcd306acd17006695406edc0cc6b5111a601799 as containerd-dev FROM linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 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/grub/Dockerfile b/tools/grub/Dockerfile index 3a63840bd..fe53f3fba 100644 --- a/tools/grub/Dockerfile +++ b/tools/grub/Dockerfile @@ -1,6 +1,6 @@ -FROM --platform=linux/amd64 linuxkit/grub-dev:4e6e8ee698d553583951f5ae3eddbce52b612001 AS grub-build-amd64 -FROM --platform=linux/arm64 linuxkit/grub-dev:4e6e8ee698d553583951f5ae3eddbce52b612001 AS grub-build-arm64 -FROM --platform=linux/riscv64 linuxkit/grub-dev:4e6e8ee698d553583951f5ae3eddbce52b612001 AS grub-build-riscv64 +FROM --platform=linux/amd64 linuxkit/grub-dev:4184bd7644a0edf73d4fe8a55171fe06f4b4d738 AS grub-build-amd64 +FROM --platform=linux/arm64 linuxkit/grub-dev:4184bd7644a0edf73d4fe8a55171fe06f4b4d738 AS grub-build-arm64 +FROM --platform=linux/riscv64 linuxkit/grub-dev:4184bd7644a0edf73d4fe8a55171fe06f4b4d738 AS grub-build-riscv64 FROM scratch ENTRYPOINT []