|
@@ -117,9 +117,6 @@ INTERACTIVE := $(shell [ -t 0 ] && echo 1 || echo 0)
|
|
|
ifeq ($(INTERACTIVE), 1)
|
|
|
DOCKER_FLAGS += -t
|
|
|
endif
|
|
|
-ifeq ($(BIND_DIR), .)
|
|
|
- DOCKER_BUILD_OPTS += --target=dev
|
|
|
-endif
|
|
|
|
|
|
DOCKER_RUN_DOCKER := $(DOCKER_FLAGS) "$(DOCKER_IMAGE)"
|
|
|
|
|
@@ -134,6 +131,21 @@ binary: build ## build the linux binaries
|
|
|
dynbinary: build ## build the linux dynbinaries
|
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+cross: DOCKER_CROSS := true
|
|
|
+cross: build ## cross build the binaries for darwin, freebsd and\nwindows
|
|
|
+ $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross
|
|
|
+
|
|
|
+ifdef DOCKER_CROSSPLATFORMS
|
|
|
+build: DOCKER_CROSS := true
|
|
|
+else
|
|
|
+build: DOCKER_CROSS ?= false
|
|
|
+endif
|
|
|
+ifeq ($(BIND_DIR), .)
|
|
|
+build: DOCKER_BUILD_OPTS += --target=dev
|
|
|
+endif
|
|
|
+build: DOCKER_BUILD_ARGS += --build-arg=CROSS=$(DOCKER_CROSS)
|
|
|
build: DOCKER_BUILDKIT ?= 1
|
|
|
build: bundles
|
|
|
$(warning The docker client CLI has moved to github.com/docker/cli. For a dev-test cycle involving the CLI, run:${\n} DOCKER_CLI_PATH=/host/path/to/cli/binary make shell ${\n} then change the cli and compile into a binary at the same location.${\n})
|
|
@@ -149,9 +161,6 @@ clean: clean-cache
|
|
|
clean-cache:
|
|
|
docker volume rm -f docker-dev-cache
|
|
|
|
|
|
-cross: build ## cross build the binaries for darwin, freebsd and\nwindows
|
|
|
- $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross
|
|
|
-
|
|
|
help: ## this help
|
|
|
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9_-]+:.*?## / {gsub("\\\\n",sprintf("\n%22c",""), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
|
|
|
|