From e58606daa093d821b92bf687d083c77684f373b3 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 24 Mar 2017 16:31:08 +0000 Subject: [PATCH] Update hyperkit Go bindings Fixes location of hyperkit executable with recent builds of Docker for Mac Signed-off-by: Justin Cormack --- tools/infrakit.hyperkit/vendor.conf | 2 +- .../vendor/github.com/docker/hyperkit/go/hyperkit.go | 1 + vendor.conf | 2 +- vendor/github.com/docker/hyperkit/README.md | 2 +- vendor/github.com/docker/hyperkit/README.xhyve.md | 4 ++-- vendor/github.com/docker/hyperkit/go/hyperkit.go | 1 + 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/infrakit.hyperkit/vendor.conf b/tools/infrakit.hyperkit/vendor.conf index 197675048..2537f46d6 100644 --- a/tools/infrakit.hyperkit/vendor.conf +++ b/tools/infrakit.hyperkit/vendor.conf @@ -3,7 +3,7 @@ github.com/Masterminds/sprig 01a849f546a584d7b29bfee253e7db0aed44f7ba github.com/Sirupsen/logrus 10f801ebc38b33738c9d17d50860f484a0988ff5 github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64 github.com/armon/go-radix 4239b77079c7b5d1243b7b4736304ce8ddb6f0f2 -github.com/docker/hyperkit 9f093be2e131133a7ec63f859d75242f1db9116e +github.com/docker/hyperkit 874e68dbb7a2a7a2794dbd8648c2f4be1e7a8bb3 github.com/docker/infrakit 208d114478ed94ee9015083e13946ca1caaad790 github.com/gorilla/context 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 github.com/gorilla/mux 599cba5e7b6137d46ddf58fb1765f5d928e69604 diff --git a/tools/infrakit.hyperkit/vendor/github.com/docker/hyperkit/go/hyperkit.go b/tools/infrakit.hyperkit/vendor/github.com/docker/hyperkit/go/hyperkit.go index a2128e35d..09e3ee6ed 100644 --- a/tools/infrakit.hyperkit/vendor/github.com/docker/hyperkit/go/hyperkit.go +++ b/tools/infrakit.hyperkit/vendor/github.com/docker/hyperkit/go/hyperkit.go @@ -60,6 +60,7 @@ const ( var defaultHyperKits = []string{"hyperkit", "com.docker.hyperkit", "/usr/local/bin/hyperkit", + "/Applications/Docker.app/Contents/Resources/bin/hyperkit", "/Applications/Docker.app/Contents/MacOS/com.docker.hyperkit"} // HyperKit contains the configuration of the hyperkit VM diff --git a/vendor.conf b/vendor.conf index b3028c5ce..3dbfe3cbe 100644 --- a/vendor.conf +++ b/vendor.conf @@ -1,4 +1,4 @@ -github.com/docker/hyperkit/go 9f093be2e131133a7ec63f859d75242f1db9116e +github.com/docker/hyperkit/go 874e68dbb7a2a7a2794dbd8648c2f4be1e7a8bb3 github.com/googleapis/gax-go 8c5154c0fe5bf18cf649634d4c6df50897a32751 github.com/golang/protobuf/proto c9c7427a2a70d2eb3bafa0ab2dc163e45f143317 github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062 diff --git a/vendor/github.com/docker/hyperkit/README.md b/vendor/github.com/docker/hyperkit/README.md index 191c48584..17c44ae11 100644 --- a/vendor/github.com/docker/hyperkit/README.md +++ b/vendor/github.com/docker/hyperkit/README.md @@ -46,7 +46,7 @@ Notes: hyperkit so the build will find the ocaml environment. - Any previous pin of `mirage-block-unix` or `qcow` should be removed with the commands: - + ```sh $ opam update $ opam pin remove mirage-block-unix diff --git a/vendor/github.com/docker/hyperkit/README.xhyve.md b/vendor/github.com/docker/hyperkit/README.xhyve.md index 9933d4572..760746ef3 100644 --- a/vendor/github.com/docker/hyperkit/README.xhyve.md +++ b/vendor/github.com/docker/hyperkit/README.xhyve.md @@ -28,7 +28,7 @@ If you have homebrew, then simply: The `--HEAD` in the brew command ensures that you always get the latest changes, even if the homebrew database is not yet updated. If for any reason you don't want that simply do `brew install xhyve` . -if not then: +if not then: Building -------- @@ -152,7 +152,7 @@ xhyve architecture ------------------------------┼------------------------------ |syscall xnu kernel V - + VMX host VMX nested paging diff --git a/vendor/github.com/docker/hyperkit/go/hyperkit.go b/vendor/github.com/docker/hyperkit/go/hyperkit.go index a2128e35d..09e3ee6ed 100644 --- a/vendor/github.com/docker/hyperkit/go/hyperkit.go +++ b/vendor/github.com/docker/hyperkit/go/hyperkit.go @@ -60,6 +60,7 @@ const ( var defaultHyperKits = []string{"hyperkit", "com.docker.hyperkit", "/usr/local/bin/hyperkit", + "/Applications/Docker.app/Contents/Resources/bin/hyperkit", "/Applications/Docker.app/Contents/MacOS/com.docker.hyperkit"} // HyperKit contains the configuration of the hyperkit VM