From 5d2f1ccbd019b21a80db4f2d4f67ea71068f33cf Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 13 Apr 2020 13:16:03 +0100 Subject: [PATCH] Update use of tools to latest Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- docs/vendoring.md | 4 ++-- src/cmd/linuxkit/moby/output.go | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 3ed0b64fd..dd952d117 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION="v0.7+" GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba +GO_COMPILE=linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 ifeq ($(OS),Windows_NT) LINUXKIT?=bin/linuxkit.exe diff --git a/docs/vendoring.md b/docs/vendoring.md index 3c6007bf4..81b69a9bb 100644 --- a/docs/vendoring.md +++ b/docs/vendoring.md @@ -22,7 +22,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba +linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 ``` To update a single dependency: @@ -32,7 +32,7 @@ docker run -it --rm \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ --entrypoint /go/bin/vndr \ -linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba +linuxkit/go-compile:d3512774dc455a6dffbd1148a5294944636639a4 github.com/docker/docker ``` diff --git a/src/cmd/linuxkit/moby/output.go b/src/cmd/linuxkit/moby/output.go index 3235b2367..402adff5d 100644 --- a/src/cmd/linuxkit/moby/output.go +++ b/src/cmd/linuxkit/moby/output.go @@ -16,18 +16,18 @@ import ( var ( outputImages = map[string]string{ - "iso": "linuxkit/mkimage-iso:3d81e29b28ddf739becf10758eb6077b198d26d8", - "iso-bios": "linuxkit/mkimage-iso-bios:131849cfc4f3ede87c2ca19b6e2a4ef86354d1ce", - "iso-efi": "linuxkit/mkimage-iso-efi:667bd641fd37062eaf9d2173c768ebfcedad3876", - "raw-bios": "linuxkit/mkimage-raw-bios:6a2365f9c90901d7e0c70507e09a0cde23c5f321", - "raw-efi": "linuxkit/mkimage-raw-efi:27de80a2180621d3d772893381a9a1b7c5fb895a", - "squashfs": "linuxkit/mkimage-squashfs:c771872c292081a36333425c12e57393bd79f4e9", - "gcp": "linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d", - "qcow2-efi": "linuxkit/mkimage-qcow2-efi:aeb084ea016689ed97bce3b52e2695591cb02693", + "iso": "linuxkit/mkimage-iso:4f1a2476ac515983ade72814cf08624c8968f65f", + "iso-bios": "linuxkit/mkimage-iso-bios:ea9a22b705b8201a201609905f7636fba8d061b9", + "iso-efi": "linuxkit/mkimage-iso-efi:c62420c8588a1d1440249c2c58f325700d72280f", + "raw-bios": "linuxkit/mkimage-raw-bios:4f3041edd9de02ef8f15bd92cc2d1afecb90084b", + "raw-efi": "linuxkit/mkimage-raw-efi:9ed69b7ac9e75aef6eebaed787223d9504dd967b", + "squashfs": "linuxkit/mkimage-squashfs:a1e99651662cb5781f8485a588ce4c85a75d7c9c", + "gcp": "linuxkit/mkimage-gcp:a296b67a8974ce2a5ce70f51ab5a65c820bff156", + "qcow2-efi": "linuxkit/mkimage-qcow2-efi:9a623f72befcaadb560290c29b9fb28f3843545b", "vhd": "linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f", "dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a", "vmdk": "linuxkit/mkimage-vmdk:b55ea46297a16d8a4448ce7f5a2df987a9602b27", - "rpi3": "linuxkit/mkimage-rpi3:9dd4f7735e19e495c2b0a856a52af15141816534", + "rpi3": "linuxkit/mkimage-rpi3:19c5354d6f8f68781adbc9bb62095ebb424222dc", } )