From d6f9f6129e11fc39533592c4e1e8a22334d2c902 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 25 Jan 2024 23:22:41 +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/images.yaml | 18 +++++++++--------- test/pkg/containerd/Dockerfile | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 5a0b95731..ddec2f993 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 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:ee5755eb38c0a6b6aef2658b757652d82556c30c as containerd-dev +FROM linuxkit/containerd-dev:c70d27ded9b10ac53abf68e8dcc2d5e4a26006a1 as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index c82f07606..e40958d0f 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:ee5755eb38c0a6b6aef2658b757652d82556c30c AS containerd-dev +FROM linuxkit/containerd-dev:c70d27ded9b10ac53abf68e8dcc2d5e4a26006a1 AS containerd-dev FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers diff --git a/src/cmd/linuxkit/moby/images.yaml b/src/cmd/linuxkit/moby/images.yaml index 022dd0cf4..e8c10329c 100644 --- a/src/cmd/linuxkit/moby/images.yaml +++ b/src/cmd/linuxkit/moby/images.yaml @@ -1,13 +1,13 @@ - iso: linuxkit/mkimage-iso:1f6fdf0ee860caf13c06a6f3f2d89413de78881e - iso-bios: linuxkit/mkimage-iso-bios:314c06ec0d72f12057c9e8d5fdf790df02dbc8c2 - iso-efi: linuxkit/mkimage-iso-efi:55b72b55ffea82d1c254c0ff5cb65df0c2c04528 - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:f7fba1acaee8afbea2771717c9faf758d0a66a87 - raw-bios: linuxkit/mkimage-raw-bios:6185592a62b860b01491d7f1661e79f62e6fc902 - raw-efi: linuxkit/mkimage-raw-efi:6a8d9ebf4f7883839e00034c1516527452c564d3 - squashfs: linuxkit/mkimage-squashfs:92dbcfe5ef69dc93276403b09a9f892f25654ed7 + iso: linuxkit/mkimage-iso:e5433bd4e8cdccd3205112065806bdc2dc729c46 + iso-bios: linuxkit/mkimage-iso-bios:9f10b30a8c4bda814300cffd10ea815d577f41ea + iso-efi: linuxkit/mkimage-iso-efi:87f7ecfd12b39500ecb5bd2dc32fc9a3933c187e + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:ddf89fad92a04f9671e7f200e0b2c5ce61dbe6cb + raw-bios: linuxkit/mkimage-raw-bios:fa43e378bb78b390452fbd06463c956748e34019 + raw-efi: linuxkit/mkimage-raw-efi:044c30d142c14af827380f9c6126567844761819 + squashfs: linuxkit/mkimage-squashfs:e75c2d21ffc76a9d3b5e6d667b4eaf3ea52eda32 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:19cb758d47c07169bc4772a7576e28d56740b004 + qcow2-efi: linuxkit/mkimage-qcow2-efi:2a12a970a090824f4151ee2b325014aa890329a3 vhd: linuxkit/mkimage-vhd:91bcc7a6475f46a3d5d84cf6161f07c583dd9c21 dynamic-vhd: linuxkit/mkimage-dynamic-vhd:b755f8ff82c8631d18decaebb09867e7b88c2533 vmdk: linuxkit/mkimage-vmdk:20a370a55bd8d58c2ae9d634c297a955bb006efd - rpi3: linuxkit/mkimage-rpi3:d76bb890e1d55c2d9395e0ca58523ee076571c21 + rpi3: linuxkit/mkimage-rpi3:4de9c144e4766bf283620371601c91638164b686 diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 29b71e88b..066889a31 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:ee5755eb38c0a6b6aef2658b757652d82556c30c as containerd-dev +FROM linuxkit/containerd-dev:c70d27ded9b10ac53abf68e8dcc2d5e4a26006a1 as containerd-dev FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs)