From 449ec612224f303440f731996dff286423f98b33 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Sun, 28 Jan 2024 15:30:31 +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 | 16 ++++++++-------- test/pkg/containerd/Dockerfile | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index f2e72ca19..f38a2340e 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 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:8f880c3f91e9d43d8d3e754847335e57980836ed as containerd-dev +FROM linuxkit/containerd-dev:c4f8d1e36b6ee0af8cde390240fbd7cf566fb7ff as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index a7b19bcaf..4d45e45cc 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:8f880c3f91e9d43d8d3e754847335e57980836ed AS containerd-dev +FROM linuxkit/containerd-dev:c4f8d1e36b6ee0af8cde390240fbd7cf566fb7ff AS containerd-dev FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 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 604ce4bbe..a9ed2ea62 100644 --- a/src/cmd/linuxkit/moby/images.yaml +++ b/src/cmd/linuxkit/moby/images.yaml @@ -1,12 +1,12 @@ - iso: linuxkit/mkimage-iso:5817aea86740ed075deff0909591dfc0c8df507d - iso-bios: linuxkit/mkimage-iso-bios:ad733f5e2331625b2791fa03ba104c4919be792e - iso-efi: linuxkit/mkimage-iso-efi:935f389ff4cb320a2dddc341acaddd35d647711d - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:7ab684beebb9cb4c76b1b15c252ea9a8713f44d9 - raw-bios: linuxkit/mkimage-raw-bios:784a31d7b2558eb52004417fda79f4b805ac56c8 - raw-efi: linuxkit/mkimage-raw-efi:14ec8d5550d0f6732370ea9dabcdce39dd13c521 - squashfs: linuxkit/mkimage-squashfs:19269c54a9b00755501d73b101e6c53af057fde7 + iso: linuxkit/mkimage-iso:6f2affe6e1e97c3c4062994f94132193dc4e9cf6 + iso-bios: linuxkit/mkimage-iso-bios:d5fdc10887c4dd58a62489ee5c42ed3383451989 + iso-efi: linuxkit/mkimage-iso-efi:9bf5e0f4a40aa12c8af9abd62f495fefb14db62e + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:66c26792550045ab75e3ffbc854117622df53c9d + raw-bios: linuxkit/mkimage-raw-bios:7edd95b128fe632da74b6252b2c220ac106b9624 + raw-efi: linuxkit/mkimage-raw-efi:637ccfb048423239282b4e710c54780fd34036b1 + squashfs: linuxkit/mkimage-squashfs:f5e805334758c510e94e156ea9c741b8ae5ef045 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:1d11c71a896921e72aa5c2262d29970c78861fa8 + qcow2-efi: linuxkit/mkimage-qcow2-efi:7c4f5816375b09b7b2815784129a75b961d7e4f0 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 7b6999832..357be665b 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:8f880c3f91e9d43d8d3e754847335e57980836ed as containerd-dev +FROM linuxkit/containerd-dev:c4f8d1e36b6ee0af8cde390240fbd7cf566fb7ff as containerd-dev FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs)