From 68caa0b911a9c8fcc6c37689cb608c13023a1b41 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Fri, 10 Jan 2025 10:56:13 +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 1f2254fd4..9f1cc0540 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:5ac048802293564a50414394e1b9896eac528e7d 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:cd0ccbbe0296488c243d6bca97f7d5f94268e8ab as containerd-dev +FROM linuxkit/containerd-dev:cb4427eaacaa64a5de9bff9ade5d929de887e280 as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 91568d4a1..8ebeeac92 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:cd0ccbbe0296488c243d6bca97f7d5f94268e8ab AS containerd-dev +FROM linuxkit/containerd-dev:cb4427eaacaa64a5de9bff9ade5d929de887e280 AS containerd-dev FROM linuxkit/alpine:5ac048802293564a50414394e1b9896eac528e7d 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 cc949ce60..090e40a46 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:fbeb844a76afc0c2358d68328b091b844a402215 - iso-bios: linuxkit/mkimage-iso-bios:a7d9059eeb586c146dabdef509aad8104bf398d7 - iso-efi: linuxkit/mkimage-iso-efi:1c128098b61df5ad295d1cb0be8a14c03e2480cd - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:5be0a6500222fd03e09615976219470a7ec0a0de - raw-bios: linuxkit/mkimage-raw-bios:e239792b5b4c4c70734cc3934925fbddf01ab71d - raw-efi: linuxkit/mkimage-raw-efi:a35d4feaf9de92365b45d1366f09421565ebf1c7 - squashfs: linuxkit/mkimage-squashfs:8acd80dfc5d22fef194e8535730ac750a49bdff2 + iso: linuxkit/mkimage-iso:1051e5f694456b696fde6aeb26f1cbf25182f4e2 + iso-bios: linuxkit/mkimage-iso-bios:889198b65d933b4029ccf76ac5c89853c6bb189f + iso-efi: linuxkit/mkimage-iso-efi:d5d47fb370a7614513ea57906845554ba471db97 + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:96b0315fd85fbf3a8f095ba151246da96f30416b + raw-bios: linuxkit/mkimage-raw-bios:391590b9f691cd81fc5e4cbc4197eb62ff1f54d5 + raw-efi: linuxkit/mkimage-raw-efi:1281c7a26b9a61aba630ecb5618a04f7a1c7ac3b + squashfs: linuxkit/mkimage-squashfs:078fbec6bb8fd4769cfb48ad42896b1a6c6fff18 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:8aba8528831d81a90be312843325778ac5748179 + qcow2-efi: linuxkit/mkimage-qcow2-efi:1f4f348c0b894276c62493de4bc8bf20747cc2e9 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 496d7fa1c..bcf498fa2 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:cd0ccbbe0296488c243d6bca97f7d5f94268e8ab as containerd-dev +FROM linuxkit/containerd-dev:cb4427eaacaa64a5de9bff9ade5d929de887e280 as containerd-dev FROM linuxkit/alpine:5ac048802293564a50414394e1b9896eac528e7d 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 8da192402..299e5c50f 100644 --- a/tools/grub/Dockerfile +++ b/tools/grub/Dockerfile @@ -1,6 +1,6 @@ -FROM --platform=linux/amd64 linuxkit/grub-dev:a61d5ca6f0c0da0983e4e9c90dfa17c35e725817 AS grub-build-amd64 -FROM --platform=linux/arm64 linuxkit/grub-dev:a61d5ca6f0c0da0983e4e9c90dfa17c35e725817 AS grub-build-arm64 -FROM --platform=linux/riscv64 linuxkit/grub-dev:a61d5ca6f0c0da0983e4e9c90dfa17c35e725817 AS grub-build-riscv64 +FROM --platform=linux/amd64 linuxkit/grub-dev:7bcb9d21eb1d817a40fe2f1a84fdbf8655ad2f40 AS grub-build-amd64 +FROM --platform=linux/arm64 linuxkit/grub-dev:7bcb9d21eb1d817a40fe2f1a84fdbf8655ad2f40 AS grub-build-arm64 +FROM --platform=linux/riscv64 linuxkit/grub-dev:7bcb9d21eb1d817a40fe2f1a84fdbf8655ad2f40 AS grub-build-riscv64 FROM scratch ENTRYPOINT []