From 927997930b08de788a39210516f2b17d8a4b017a Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Sun, 28 Jan 2024 20:51:14 +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 725241af4..63ac37952 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:7aea0bb7faf70f35c6b7d2d244c91da1d4b3ea93 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:c4f8d1e36b6ee0af8cde390240fbd7cf566fb7ff as containerd-dev +FROM linuxkit/containerd-dev:25522a7fcffd14465d807fadc3d3e4f6da7b10ec as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index a46944dff..c6aa684d9 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:c4f8d1e36b6ee0af8cde390240fbd7cf566fb7ff AS containerd-dev +FROM linuxkit/containerd-dev:25522a7fcffd14465d807fadc3d3e4f6da7b10ec AS containerd-dev FROM linuxkit/alpine:7aea0bb7faf70f35c6b7d2d244c91da1d4b3ea93 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 a9ed2ea62..2a5a201fd 100644 --- a/src/cmd/linuxkit/moby/images.yaml +++ b/src/cmd/linuxkit/moby/images.yaml @@ -1,12 +1,12 @@ - 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 + iso: linuxkit/mkimage-iso:08d19f8acf285bdce65dd4aea24f01d8adbedfbc + iso-bios: linuxkit/mkimage-iso-bios:96d5dac296345c308b8ad9e6cae7467e76ba8fd1 + iso-efi: linuxkit/mkimage-iso-efi:cf2a3ff1dacfcacfb1f165abc210d9e33dc9d161 + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:a9e61bc810ae9928bab92f41f6e810e5b4f6183a + raw-bios: linuxkit/mkimage-raw-bios:4c21d66c81fd3641c62b9e80ddf5494000a1a442 + raw-efi: linuxkit/mkimage-raw-efi:df0979572e8d0251a5cf55b6f73131868d036bb4 + squashfs: linuxkit/mkimage-squashfs:a61fd76227ab4998d6c1ba17229cd8bd749e8f13 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:7c4f5816375b09b7b2815784129a75b961d7e4f0 + qcow2-efi: linuxkit/mkimage-qcow2-efi:98a6e3e7b6eed965f879cd77c009c7c404d4457d 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 1c664a9e4..25fa230c5 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:c4f8d1e36b6ee0af8cde390240fbd7cf566fb7ff as containerd-dev +FROM linuxkit/containerd-dev:25522a7fcffd14465d807fadc3d3e4f6da7b10ec as containerd-dev FROM linuxkit/alpine:7aea0bb7faf70f35c6b7d2d244c91da1d4b3ea93 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs)