Embeds xhyve

README.md

@@ -30,19 +30,6 @@ If you were doubt problem either, please post to this repository [issues](https:
 > make install
 ```
 
-### xhyve-bindings
-https://github.com/zchee/xhyve-bindings
-
-Separated xhyve Go bindings into [xhyve-bindings](https://github.com/zchee/xhyve-bindings).  
-Or, see experimental embedded xhyve branch [embed-xhyve](https://github.com/zchee/docker-machine-driver-xhyve/tree/embed-xhyve)
-
-```bash
-> go get -d github.com/zchee/xhyve-bindings
-> cd $GOPATH/src/github.com/zchee/xhyve-bindings
-> make
-> make install
-```
-
 ## Install
 
 Like the docker-machine's `Makefile`, install the `docker-machine-driver-xhyve` binary will be in `/usr/local/bin`.  

bin/main.go

@@ -1,10 +1,20 @@
 package main
 
 import (
+	"os"
+
 	"github.com/docker/machine/libmachine/drivers/plugin"
+	goxhyve "github.com/hooklift/xhyve"
 	"github.com/zchee/docker-machine-driver-xhyve"
 )
 
 func main() {
-	plugin.RegisterDriver(new(xhyve.Driver))
+	if len(os.Args) >= 2 && os.Args[1] == "xhyve" {
+		args := os.Args[1:] // Technically we only need 2:, but a bug in hooklift/xhyve requires one arg in the beginning
+		if err := goxhyve.Run(args, make(chan string)); err != nil {
+			panic(err)
+		}
+	} else {
+		plugin.RegisterDriver(xhyve.NewDriver("", ""))
+	}
 }

mk/driver.mk

@@ -54,12 +54,15 @@ test-upgrade:
 test-url:
 	${DOCKER_MACHINE_CMD} --storage-path ${DOCKER_MACHINE_STORAGEPATH} url ${DOCKER_MACHINE_VM_NAME}
 
-driver-run: clean build install driver-kill
-	rm -rf ${DOCKER_MACHINE_STORAGEPATH}/machines/${DOCKER_MACHINE_VM_NAME} && ${DOCKER_MACHINE_CMD} --storage-path ${DOCKER_MACHINE_STORAGEPATH} create --driver xhyve --xhyve-disk-size ${DOCKER_MACHINE_VM_DISKSIZE} ${DOCKER_MACHINE_VM_NAME}
+driver-run: clean build install driver-remove driver-kill
+	${DOCKER_MACHINE_CMD} --storage-path ${DOCKER_MACHINE_STORAGEPATH} create --driver xhyve --xhyve-disk-size ${DOCKER_MACHINE_VM_DISKSIZE} ${DOCKER_MACHINE_VM_NAME}
 
 driver-kill:
 	@PID=$$(pgrep goxhyve) || PID=none; \
 	echo "${CBLUE}==>${CRESET}${CGREEN}Kill goxhyve test process. PID:$$PID ${CRESET} ..."; \
 	sudo kill $$PID 2>/dev/null || true
 
+driver-remove:
+	${DOCKER_MACHINE_CMD} --storage-path ${DOCKER_MACHINE_STORAGEPATH} rm -f ${DOCKER_MACHINE_VM_NAME} || true
+
 .PHONY: driver-kill