From f7c50156c534540529d99209fef656d5a1c00d1b Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 9 Oct 2017 15:01:44 +0100 Subject: [PATCH] tools: pull linuxkit/guestfs by digest only (not digest+tag) Current versions of Docker complain: Sending build context to Docker daemon 5.12kB Step 1/4 : FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f ... Successfully tagged linuxkit/mkimage-gcp:736880776838c8f41c081276d9c017ae6adbf1bb-amd64 Tagging linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f as linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f refusing to create a tag with a digest reference ../../pkg/package.mk:82: recipe for target 'tag-y' failed Just use the digest for now. Perhaps someone will have time to fixup this build properly at some point. Make the same change to test/pkg/ltp. Signed-off-by: Ian Campbell --- test/pkg/ltp/Dockerfile | 6 ++++-- tools/mkimage-dynamic-vhd/Dockerfile | 3 ++- tools/mkimage-gcp/Dockerfile | 3 ++- tools/mkimage-vhd/Dockerfile | 3 ++- tools/mkimage-vmdk/Dockerfile | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/test/pkg/ltp/Dockerfile b/test/pkg/ltp/Dockerfile index 77e181195..5c5deadea 100644 --- a/test/pkg/ltp/Dockerfile +++ b/test/pkg/ltp/Dockerfile @@ -1,4 +1,5 @@ -FROM debian:jessie@sha256:476959f29a17423a24a17716e058352ff6fbf13d8389e4a561c8ccc758245937 AS build +# debian:jessie +FROM debian@sha256:476959f29a17423a24a17716e058352ff6fbf13d8389e4a561c8ccc758245937 AS build ENV LTP_VERSION=20170116 ENV LTP_SOURCE=https://github.com/linux-test-project/ltp/releases/download/${LTP_VERSION}/ltp-full-${LTP_VERSION}.tar.xz @@ -17,7 +18,8 @@ RUN cd /ltp \ && make -j "$(getconf _NPROCESSORS_ONLN)" all \ && make install -FROM debian:jessie-slim@sha256:12d31a3d5a1f7cb272708be35031ba068dec46fa84af6aeb38aef5c8a83e8974 +# debian:jessie-slim +FROM debian@sha256:12d31a3d5a1f7cb272708be35031ba068dec46fa84af6aeb38aef5c8a83e8974 COPY --from=build /opt/ltp/ /opt/ltp/ ADD check.sh ./check.sh WORKDIR /opt/ltp diff --git a/tools/mkimage-dynamic-vhd/Dockerfile b/tools/mkimage-dynamic-vhd/Dockerfile index 3d74bfa62..e05e3bafd 100644 --- a/tools/mkimage-dynamic-vhd/Dockerfile +++ b/tools/mkimage-dynamic-vhd/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f +# linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed +FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f COPY . . diff --git a/tools/mkimage-gcp/Dockerfile b/tools/mkimage-gcp/Dockerfile index f7470dc8a..91c654b15 100644 --- a/tools/mkimage-gcp/Dockerfile +++ b/tools/mkimage-gcp/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f +# linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed +FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f COPY . . diff --git a/tools/mkimage-vhd/Dockerfile b/tools/mkimage-vhd/Dockerfile index bf8312950..20a59e567 100644 --- a/tools/mkimage-vhd/Dockerfile +++ b/tools/mkimage-vhd/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f +# linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed +FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f COPY . . diff --git a/tools/mkimage-vmdk/Dockerfile b/tools/mkimage-vmdk/Dockerfile index 5d32e483c..9d9303f03 100644 --- a/tools/mkimage-vmdk/Dockerfile +++ b/tools/mkimage-vmdk/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f +# linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed +FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f COPY . .