diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 5a3ecc72b..9798c60cb 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:6584375f70524a4684f10e7155d91380420f5392 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:c70d27ded9b10ac53abf68e8dcc2d5e4a26006a1 as containerd-dev +FROM linuxkit/containerd-dev:caa8cc66de281276c99c8457066270565f1c4821 as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 6a787443d..f754725de 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:c70d27ded9b10ac53abf68e8dcc2d5e4a26006a1 AS containerd-dev +FROM linuxkit/containerd-dev:caa8cc66de281276c99c8457066270565f1c4821 AS containerd-dev FROM linuxkit/alpine:6584375f70524a4684f10e7155d91380420f5392 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 e8c10329c..8330df180 100644 --- a/src/cmd/linuxkit/moby/images.yaml +++ b/src/cmd/linuxkit/moby/images.yaml @@ -1,12 +1,12 @@ - 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 + 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 gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:2a12a970a090824f4151ee2b325014aa890329a3 + qcow2-efi: linuxkit/mkimage-qcow2-efi:3a804309fbc14f79a394a162d7a5897a66cd807b 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 b888dab6d..9f3277fbd 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/containerd-dev:c70d27ded9b10ac53abf68e8dcc2d5e4a26006a1 as containerd-dev +FROM linuxkit/containerd-dev:caa8cc66de281276c99c8457066270565f1c4821 as containerd-dev FROM linuxkit/alpine:6584375f70524a4684f10e7155d91380420f5392 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs)