diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index ee71776db..daaa24e9a 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -4,7 +4,7 @@ FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e 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:af26a5c09a71b919ee8113501d783a5bf299482d as containerd-dev +FROM linuxkit/containerd-dev:a895ff37d0838ca3315b2ea120bcb81bbbaba49a as containerd-dev FROM scratch ENTRYPOINT [] diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 4436e7adc..261f534e6 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to build linuxkit/init for linuxkit -FROM linuxkit/containerd-dev:af26a5c09a71b919ee8113501d783a5bf299482d AS containerd-dev -FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS build +FROM linuxkit/containerd-dev:a895ff37d0838ca3315b2ea120bcb81bbbaba49a AS containerd-dev +FROM linuxkit/alpine:8b113dc94b6f6ab9e1b4a526586365f2783e7b32 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ diff --git a/src/cmd/linuxkit/moby/build/images.yaml b/src/cmd/linuxkit/moby/build/images.yaml index 97bf21735..b0491fa6e 100644 --- a/src/cmd/linuxkit/moby/build/images.yaml +++ b/src/cmd/linuxkit/moby/build/images.yaml @@ -1,12 +1,12 @@ - iso: linuxkit/mkimage-iso:08d19f8acf285bdce65dd4aea24f01d8adbedfbc - iso-bios: linuxkit/mkimage-iso-bios:96d5dac296345c308b8ad9e6cae7467e76ba8fd1 - iso-efi: linuxkit/mkimage-iso-efi:8b538605a581db7523c021bf92a715d2054f609e - iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:d390030aae1069f3142523e9f433aad946838911 - raw-bios: linuxkit/mkimage-raw-bios:4c21d66c81fd3641c62b9e80ddf5494000a1a442 - raw-efi: linuxkit/mkimage-raw-efi:14b66a308b2047c59b0fe7c43996f73c653a9fcd - squashfs: linuxkit/mkimage-squashfs:a61fd76227ab4998d6c1ba17229cd8bd749e8f13 + iso: linuxkit/mkimage-iso:b48f08e3139f61ff6db23616fdab8176359c8476 + iso-bios: linuxkit/mkimage-iso-bios:507b4c47691ac1760d788dfb66248c7100ae6f34 + iso-efi: linuxkit/mkimage-iso-efi:17d263e318864b4f2349827659b842a1dc50717d + iso-efi-initrd: linuxkit/mkimage-iso-efi-initrd:b395767abae91cb3b1cb3b7b85ce260dbb12272e + raw-bios: linuxkit/mkimage-raw-bios:43ccb56580e0ab0d5bd0932273ca70a7c6a3d62a + raw-efi: linuxkit/mkimage-raw-efi:ea9263c6b5fbfa59f656f254a2da356087688f45 + squashfs: linuxkit/mkimage-squashfs:0438bf54831e9eb9755b79a7704173aed5fe35bf gcp: linuxkit/mkimage-gcp:035c2c2b4b958060c0b6bdd41d9cbc886a335098 - qcow2-efi: linuxkit/mkimage-qcow2-efi:8b76f4118e6640db6f39196dc365529f401e7670 + qcow2-efi: linuxkit/mkimage-qcow2-efi:8f9e54f08865cf48dc09d5cadfc6e8d6d99768ce 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 792258b47..aac475115 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,5 +1,5 @@ -FROM linuxkit/containerd-dev:af26a5c09a71b919ee8113501d783a5bf299482d as containerd-dev -FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror +FROM linuxkit/containerd-dev:a895ff37d0838ca3315b2ea120bcb81bbbaba49a as containerd-dev +FROM linuxkit/alpine:8b113dc94b6f6ab9e1b4a526586365f2783e7b32 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup)