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

Update use of tools to latest

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2018-07-10 15:13:58 +01:00
parent cd4d50920a
commit a0a4ec5449
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

@ -1,7 +1,7 @@
VERSION="v0.4+" VERSION="v0.4+"
GIT_COMMIT=$(shell git rev-list -1 HEAD) GIT_COMMIT=$(shell git rev-list -1 HEAD)
GO_COMPILE=linuxkit/go-compile:a8031514cbd017cd10207de56be3434b9d7c6fd7 GO_COMPILE=linuxkit/go-compile:49a2e8f8672ca95ad0159eebcc631773503465c1
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
LINUXKIT?=bin/linuxkit.exe LINUXKIT?=bin/linuxkit.exe

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:a8031514cbd017cd10207de56be3434b9d7c6fd7 linuxkit/go-compile:49a2e8f8672ca95ad0159eebcc631773503465c1
``` ```
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:a8031514cbd017cd10207de56be3434b9d7c6fd7 linuxkit/go-compile:49a2e8f8672ca95ad0159eebcc631773503465c1
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:fea1990f9703f24fc3c71ecd33695b60ca11043c", "iso-bios": "linuxkit/mkimage-iso-bios:fd0092700bc19ea36cc8dccccc9799b7847b4909",
"iso-efi": "linuxkit/mkimage-iso-efi:6948ef717ff8b0ca5831ff6b281404ae7f61d36c", "iso-efi": "linuxkit/mkimage-iso-efi:79148c60bbf2a9526d976d708840492d85b0c576",
"raw-bios": "linuxkit/mkimage-raw-bios:89577baee3bf6e4b7c6669e9e7d16181a0aefbbf", "raw-bios": "linuxkit/mkimage-raw-bios:0ff04de5d11a88b0712cdc85b2ee5f0b966ffccf",
"raw-efi": "linuxkit/mkimage-raw-efi:276b61f502a7e4667e4a343df15e379f451e4cc3", "raw-efi": "linuxkit/mkimage-raw-efi:084f159cb44dc6c22351a70f1c1a043857be4e12",
"squashfs": "linuxkit/mkimage-squashfs:3c5db8c90dfa828f9cfcf90f050c1db5ef177420", "squashfs": "linuxkit/mkimage-squashfs:36f3fa106cfb7f8b818a828d7aebb27f946c9526",
"gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1", "gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1",
"qcow2-efi": "linuxkit/mkimage-qcow2-efi:fa3756a291319d0250a9eac1471296d8e4cae0f8", "qcow2-efi": "linuxkit/mkimage-qcow2-efi:0eb853459785fad0b518d8edad3b7434add6ad96",
"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:c0645c61c71f7233a4a7cde2afecf41011668417", "rpi3": "linuxkit/mkimage-rpi3:be740259f3b49bfe46f5322e22709c3af2111b33",
} }
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:4e47c416a9176029a45514d1fd911c0e995a0b84" QemuImg = "linuxkit/qemu:5d89b7a57b638eba986df318c97fa9d5905135a5"
defaultFWPath = "/usr/share/ovmf/bios.bin" defaultFWPath = "/usr/share/ovmf/bios.bin"
) )