From 79e91dedf847756dec00ee84cf78343ffdd7f091 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Sat, 27 Jan 2024 22:27: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 be708a39e..19e50d29e 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:29e84088fdd519268b05c622e4437d205acb6323 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:caa8cc66de281276c99c8457066270565f1c4821 as containerd-dev +FROM linuxkit/containerd-dev:c6f84bdaf33d4355e97290e0ece3bf17bbcfd316 as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 64810eb65..cb6814b29 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:caa8cc66de281276c99c8457066270565f1c4821 AS containerd-dev +FROM linuxkit/containerd-dev:c6f84bdaf33d4355e97290e0ece3bf17bbcfd316 AS containerd-dev FROM linuxkit/alpine:29e84088fdd519268b05c622e4437d205acb6323 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 8330df180..73dc580c9 100644 --- a/src/cmd/linuxkit/moby/images.yaml +++ b/src/cmd/linuxkit/moby/images.yaml @@ -1,12 +1,12 @@ - iso: linuxkit/mkimage-iso:6d3b8337d30c705b9b8f8ac9bf3d7881acd7c5cc - iso-bios: linuxkit/mkimage-iso-bios:79517452d97f9088285c1419af3ee5956902e151 - iso-efi: linuxkit/mkimage-iso-efi:163186248c7a6e1681398d33cebef2c707ebe6fb - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:a8f2069e01848cabccfa4934943685781427dc73 - raw-bios: linuxkit/mkimage-raw-bios:76334750553edf6f2d66dcfcdbb487cea4f912da - raw-efi: linuxkit/mkimage-raw-efi:7d5519ebdb9f41663a549e582c41d369135f503b - squashfs: linuxkit/mkimage-squashfs:fa8496541458b027934f86e3e49bf8d7b032bb8f + iso: linuxkit/mkimage-iso:adafb2e4fe90ceb4545c517ea7ccbfde02a06b31 + iso-bios: linuxkit/mkimage-iso-bios:b5654a10db5e22c2b1aef78adb890b14703127a4 + iso-efi: linuxkit/mkimage-iso-efi:9be2fef27190e0dcd8781746104a75b2307e9224 + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:b7c45c4438243c48eac5dae77541407713dfedb1 + raw-bios: linuxkit/mkimage-raw-bios:05f8f446137f4b7327724350aaf0d2fcaead17f3 + raw-efi: linuxkit/mkimage-raw-efi:873f8c73eb15a51d2d46342f83c61d94430a73bb + squashfs: linuxkit/mkimage-squashfs:5840793b5df4abf0158b03654058bec9183146a4 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:3a804309fbc14f79a394a162d7a5897a66cd807b + qcow2-efi: linuxkit/mkimage-qcow2-efi:b9b44471a8716da39b7fc02a5e61fd374a4a6f00 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 736ed0909..f7b402000 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:caa8cc66de281276c99c8457066270565f1c4821 as containerd-dev +FROM linuxkit/containerd-dev:c6f84bdaf33d4355e97290e0ece3bf17bbcfd316 as containerd-dev FROM linuxkit/alpine:29e84088fdd519268b05c622e4437d205acb6323 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs)