github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Update use of tools to latest

Browse Source 
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2019-04-16 23:16:18 +01:00
parent 94bfb97ba3
commit da3f1e9c6c
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
VERSION="v0.6+"
GIT_COMMIT=$(shell git rev-list -1 HEAD)
GO_COMPILE=linuxkit/go-compile:0a927ab41060951b15645f0f9cc257ec810c0a0f
GO_COMPILE=linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba
ifeq ($(OS),Windows_NT)
LINUXKIT?=bin/linuxkit.exe

4
docs/vendoring.md
View File

@ -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:0a927ab41060951b15645f0f9cc257ec810c0a0f
linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba
```
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:0a927ab41060951b15645f0f9cc257ec810c0a0f
linuxkit/go-compile:8de0e27a38498389e43b3a5b520d943a2b3be5ba
github.com/docker/docker
```

16
src/cmd/linuxkit/moby/output.go
View File

@ -16,18 +16,18 @@ import (
var (
outputImages = map[string]string{
"iso": "linuxkit/mkimage-iso:17c68596851349c9d8917459116f7d3409f12fdd",
"iso-bios": "linuxkit/mkimage-iso-bios:50aedc359bc13ee2d472a73d6e6740740b809c95",
"iso-efi": "linuxkit/mkimage-iso-efi:a74d5b0d6656c2147772f867751ae8fc295b13d2",
"raw-bios": "linuxkit/mkimage-raw-bios:71a966249ffbb23a499cfca280bbabb8afbbd530",
"raw-efi": "linuxkit/mkimage-raw-efi:f0dc5faa8c75a0aba2de6d24076c544cddd7f3e7",
"squashfs": "linuxkit/mkimage-squashfs:c409c0f2045a0b9bffec38b981994a3e02852443",
"iso": "linuxkit/mkimage-iso:3d81e29b28ddf739becf10758eb6077b198d26d8",
"iso-bios": "linuxkit/mkimage-iso-bios:131849cfc4f3ede87c2ca19b6e2a4ef86354d1ce",
"iso-efi": "linuxkit/mkimage-iso-efi:1fdcfa6ae73907eb41cbfe2db8eddcbfe11a6c66",
"raw-bios": "linuxkit/mkimage-raw-bios:3d6a6d932e124a0430e36d232dd51af1deef53c3",
"raw-efi": "linuxkit/mkimage-raw-efi:623c9a4a3282d05eeb145c615638dfb1f9919e54",
"squashfs": "linuxkit/mkimage-squashfs:c771872c292081a36333425c12e57393bd79f4e9",
"gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1",
"qcow2-efi": "linuxkit/mkimage-qcow2-efi:b461760411b7295c91246b1d2df8ce13a96ce3c9",
"qcow2-efi": "linuxkit/mkimage-qcow2-efi:ec1f27cff4f84cef7ec4bf7e77c18c8a58b9a356",
"vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242",
"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6",
"vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5",
"rpi3": "linuxkit/mkimage-rpi3:b787b1210a0e13456a8f128722f1134e3933907b",
"rpi3": "linuxkit/mkimage-rpi3:97a9387ff0ff5db867dd8af931b825e55108bea4",
}
)

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

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