Merge pull request #21249 from sftim/20200527_makefile_docker_alternatives

k8s-ci-robot · web-flow · commit 1d445a8c7ae2 · 2020-06-09T08:51:19.000-07:00
Allow specifying alternative tool for containerized local testing
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-DOCKER       = docker
+DOCKER      ?= docker
 HUGO_VERSION = $(shell grep ^HUGO_VERSION netlify.toml | tail -n 1 | cut -d '=' -f 2 | tr -d " \"\n")
 DOCKER_IMAGE = kubernetes-hugo
 DOCKER_RUN   = $(DOCKER) run --rm --interactive --tty --volume $(CURDIR):/src

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-DOCKER = docker`
	`1`	`+DOCKER ?= docker`
`2`	`2`	`HUGO_VERSION = $(shell grep ^HUGO_VERSION netlify.toml \| tail -n 1 \| cut -d '=' -f 2 \| tr -d " \"\n")`
`3`	`3`	`DOCKER_IMAGE = kubernetes-hugo`
`4`	`4`	`DOCKER_RUN = $(DOCKER) run --rm --interactive --tty --volume $(CURDIR):/src`