Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1961 from dmp42/12-targets-fix

Browse Source 
Fix building in docker
This commit is contained in:
Olivier Gambier
2015-10-09 15:44:14 -07:00
parent caab273780 7c8fc35c69
commit 6a5219b879
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -10,8 +10,8 @@ else
DOCKER_IMAGE_NAME := "docker-machine-build"
DOCKER_CONTAINER_NAME := "docker-machine-build-container"
test: FORCE
build:
test: build
%:
@docker build -t $(DOCKER_IMAGE_NAME) .

0
main_test.go → cmd/machine_test.go
View File

4
mk/build.mk
View File

@@ -13,11 +13,11 @@ $(PREFIX)/bin/docker-%: ./cmd/%.go $(shell find . -type f -name '*.go')
$(GO) build -o $@ $(VERBOSE_GO) -tags "$(BUILDTAGS)" -ldflags "$(GO_LDFLAGS)" $(GO_GCFLAGS) $<
# Native build
build-simple: $(patsubst ./cmd/%.go,$(PREFIX)/bin/docker-%,$(wildcard ./cmd/*.go))
build-simple: $(patsubst ./cmd/%.go,$(PREFIX)/bin/docker-%,$(filter-out %_test.go, $(wildcard ./cmd/*.go)))
# Cross compilation targets
build-x-%: ./cmd/%.go $(shell find . -type f -name '*.go')
@$(foreach GOARCH,$(TARGET_ARCH),$(foreach GOOS,$(TARGET_OS),$(call gocross,$(GOOS),$(GOARCH),$<)))
# Cross-build
build-x: $(patsubst ./cmd/%.go,build-x-%,$(wildcard ./cmd/*.go))
build-x: $(patsubst ./cmd/%.go,build-x-%,$(filter-out %_test.go, $(wildcard ./cmd/*.go)))