Skip to content

Commit

Permalink
Merge pull request docker#531 from seemethere/add_cross_targets
Browse files Browse the repository at this point in the history
Add a way to just build windows and osx
  • Loading branch information
Vincent Demeester authored Sep 20, 2017
2 parents 9e162fb + 51080d6 commit bd31cb4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ binary: ## build executable for Linux
cross: ## build executable for macOS and Windows
./scripts/build/cross

.PHONY: binary-windows
binary-windows: ## build executable for Windows
./scripts/build/windows

.PHONY: binary-osx
binary-osx: ## build executable for macOS
./scripts/build/osx

.PHONY: dynbinary
dynbinary: ## build dynamically linked binary
./scripts/build/dynbinary
Expand Down
8 changes: 8 additions & 0 deletions docker.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ test: test-unit test-e2e
cross: build_cross_image
docker run --rm $(ENVVARS) $(MOUNTS) $(CROSS_IMAGE_NAME) make cross

.PHONY: binary-windows
binary-windows: build_cross_image
docker run --rm $(ENVVARS) $(MOUNTS) $(CROSS_IMAGE_NAME) make $@

.PHONY: binary-osx
binary-osx: build_cross_image
docker run --rm $(ENVVARS) $(MOUNTS) $(CROSS_IMAGE_NAME) make $@

.PHONY: watch
watch: build_docker_image
docker run --rm $(ENVVARS) $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make watch
Expand Down

0 comments on commit bd31cb4

Please sign in to comment.