Skip to content

Commit e60bf66

Browse files
committedAug 15, 2017
Jenkins/Makefile targets.
1 parent 703d992 commit e60bf66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+4153
-34
lines changed
 

‎Godeps/Godeps.json

+52-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ $(GOPATH)/bin/go-bindata:
155155
GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...
156156

157157
.PHONY: cross
158-
cross: out/localkube out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe
158+
cross: out/localkube out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe out/docker-machine-driver-hyperkit
159159

160160
.PHONY: checksum
161161
checksum:
@@ -208,11 +208,15 @@ out/minikube-installer.exe: out/minikube-windows-amd64.exe
208208
rm -rf out/windows_tmp
209209

210210
out/docker-machine-driver-hyperkit:
211-
go build -o $(BUILD_DIR)/hyperkit k8s.io/minikube/cmd/drivers/hyperkit
211+
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
212+
$(MINIKUBE_DOCKER_CMD) '$(MINIKUBE_ENV_darwin_DOCKER) $(MINIKUBE_ENV_darwin) go build -o $(BUILD_DIR)/docker-machine-driver-hyperkit k8s.io/minikube/cmd/drivers/hyperkit'
213+
else
214+
$(MINIKUBE_ENV_darwin) go build -o $(BUILD_DIR)/docker-machine-driver-hyperkit k8s.io/minikube/cmd/drivers/hyperkit
215+
endif
212216

213217
.PHONY: install-hyperkit-driver
214218
install-hyperkit-driver: out/docker-machine-driver-hyperkit
215-
sudo cp out/hyperkit $(HOME)/bin/docker-machine-driver-hyperkit
219+
sudo cp out/docker-machine-driver-hyperkit $(HOME)/bin/docker-machine-driver-hyperkit
216220
sudo chown root:wheel $(HOME)/bin/docker-machine-driver-hyperkit
217221
sudo chmod u+s $(HOME)/bin/docker-machine-driver-hyperkit
218222

0 commit comments

Comments
 (0)
Please sign in to comment.