From 9cf5d809e8a05f8c18dafd6135ea7f6b4f94efed Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Sun, 28 Jan 2024 10:54:09 +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 ba2ae9fbd..395f3438d 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:275ef778d89133ebec5e80d82c664c3549f919d4 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:c6f84bdaf33d4355e97290e0ece3bf17bbcfd316 as containerd-dev +FROM linuxkit/containerd-dev:8f880c3f91e9d43d8d3e754847335e57980836ed as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 4b5ab9d20..0f53b0755 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:c6f84bdaf33d4355e97290e0ece3bf17bbcfd316 AS containerd-dev +FROM linuxkit/containerd-dev:8f880c3f91e9d43d8d3e754847335e57980836ed AS containerd-dev FROM linuxkit/alpine:275ef778d89133ebec5e80d82c664c3549f919d4 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 73dc580c9..604ce4bbe 100644 --- a/src/cmd/linuxkit/moby/images.yaml +++ b/src/cmd/linuxkit/moby/images.yaml @@ -1,12 +1,12 @@ - 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 + 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 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:b9b44471a8716da39b7fc02a5e61fd374a4a6f00 + qcow2-efi: linuxkit/mkimage-qcow2-efi:1d11c71a896921e72aa5c2262d29970c78861fa8 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 6857b59bb..ade4beaae 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:c6f84bdaf33d4355e97290e0ece3bf17bbcfd316 as containerd-dev +FROM linuxkit/containerd-dev:8f880c3f91e9d43d8d3e754847335e57980836ed as containerd-dev FROM linuxkit/alpine:275ef778d89133ebec5e80d82c664c3549f919d4 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs)