github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Update use of tools to latest

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
This commit is contained in:
Rolf Neugebauer 2018-05-12 12:38:05 +01:00
parent d9c3e3fce2
commit 5de0a86293
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -7,7 +7,7 @@ all: default
VERSION="v0.3+" VERSION="v0.3+"
GIT_COMMIT=$(shell git rev-list -1 HEAD) GIT_COMMIT=$(shell git rev-list -1 HEAD)
GO_COMPILE=linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931 GO_COMPILE=linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79
LINUXKIT?=bin/linuxkit LINUXKIT?=bin/linuxkit
GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]') GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]')

4
docs/vendoring.md
View File

@ -28,7 +28,7 @@ docker run -it --rm \
-v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \
-w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
--entrypoint /go/bin/vndr \ --entrypoint /go/bin/vndr \
linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931 linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79
``` ```
To update a single dependency: To update a single dependency:
@ -38,7 +38,7 @@ docker run -it --rm \
-v $(pwd):/go/src/github.com/linuxkit/linuxkit \ -v $(pwd):/go/src/github.com/linuxkit/linuxkit \
-w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \ -w /go/src/github.com/linuxkit/linuxkit/src/cmd/linuxkit \
--entrypoint /go/bin/vndr \ --entrypoint /go/bin/vndr \
linuxkit/go-compile:2940a8141d907c2976be15f201f6e9b7c4c1f931 linuxkit/go-compile:a8bffe875268a973ea82e5937b0fb23a5b08cc79
github.com/docker/docker github.com/docker/docker
``` ```

14
src/cmd/linuxkit/main.go
View File

@ -19,17 +19,17 @@ func init() {
// This allows us to overwrite the hashes locally without having // This allows us to overwrite the hashes locally without having
// to re-vendor the 'github.com/moby/tool' when we update 'mkimage-*' // to re-vendor the 'github.com/moby/tool' when we update 'mkimage-*'
imgs := map[string]string{ imgs := map[string]string{
"iso-bios": "linuxkit/mkimage-iso-bios:9a51dc64a461f1cc50ba05f30a38f73f5227ac03", "iso-bios": "linuxkit/mkimage-iso-bios:86981371921813019ea0f12c778b348a9a3d40ed",
"iso-efi": "linuxkit/mkimage-iso-efi:343cf1a8ac0aba7d8a1f13b7f45fa0b57ab897dc", "iso-efi": "linuxkit/mkimage-iso-efi:1cebc76eab89254f3e288526890bbc7cddf0ffaf",
"raw-bios": "linuxkit/mkimage-raw-bios:d90713b2dd610cf9a0f5f9d9095f8bf86f40d5c6", "raw-bios": "linuxkit/mkimage-raw-bios:3b1a68b2d652180ccb57ef9d2580af7e7d966d35",
"raw-efi": "linuxkit/mkimage-raw-efi:8938ffb6014543e557b624a40cce1714f30ce4b6", "raw-efi": "linuxkit/mkimage-raw-efi:6743fc2b475dcb7da510ea2b6029dbcaadf94805",
"squashfs": "linuxkit/mkimage-squashfs:b44d00b0a336fd32c122ff32bd2b39c36a965135", "squashfs": "linuxkit/mkimage-squashfs:99efca8bc93737fcb56880c444b9142a2166a79e",
"gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1", "gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1",
"qcow2-efi": "linuxkit/mkimage-qcow2-efi:787b54906e14a56b9f1da35dcc8e46bd58435285", "qcow2-efi": "linuxkit/mkimage-qcow2-efi:2525659ffe71502f4307766c2321075350c3448e",
"vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242", "vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242",
"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6", "dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6",
"vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5", "vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5",
"rpi3": "linuxkit/mkimage-rpi3:0f23c4f37cdca99281ca33ac6188e1942fa7a2b8", "rpi3": "linuxkit/mkimage-rpi3:0cedb2da51efe25309bef391e5c904cef645b5ea",
} }
if err := moby.UpdateOutputImages(imgs); err != nil { if err := moby.UpdateOutputImages(imgs); err != nil {
log.Fatalf("Failed to register mkimage-*. %v", err) log.Fatalf("Failed to register mkimage-*. %v", err)

2
src/cmd/linuxkit/run_qemu.go
View File

@ -20,7 +20,7 @@ import (
// QemuImg is the version of qemu container // QemuImg is the version of qemu container
const ( const (
QemuImg = "linuxkit/qemu:099ab6ec9a2f38947e839e5f6a02fa0af3529440" QemuImg = "linuxkit/qemu:e85ce22b5c133eafbd3e6f110512e53d2e1e1596"
defaultFWPath = "/usr/share/ovmf/bios.bin" defaultFWPath = "/usr/share/ovmf/bios.bin"
) )