Simplify build using --build-arg

vmware · Jul 3, 2018 · 3b33946 · 3b33946
1 parent 8042b9a
commit 3b33946
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/base-image/Makefile b/base-image/Makefile
@@ -5,7 +5,7 @@ IMAGE ?= vmware/base-fluentd-operator
 TAG ?= latest
 
 build-image:
-	docker build . -t $(IMAGE):$(TAG)
+	docker build -t $(IMAGE):$(TAG) .
 
 shell:
 	docker run --entrypoint=/bin/bash \

diff --git a/config-reloader/Dockerfile b/config-reloader/Dockerfile
@@ -11,7 +11,7 @@ COPY . .
 
 # Speed up local builds where vendor is populated
 RUN [ -d vendor/github.com ] || make dep; true
-
+ARG VERSION
 RUN make test
 RUN make build VERSION=$VERSION
 

diff --git a/config-reloader/Makefile b/config-reloader/Makefile
@@ -31,9 +31,7 @@ clean:
 	rm -fr config-reloader pkg > /dev/null
 
 build-image:
-	cat Dockerfile | \
-	  VERSION=$(VERSION) envsubst '$$VERSION' | \
-	  docker build . -f - -t $(IMAGE):$(TAG)
+	docker build --build-arg VERSION=$(VERSION) -t $(IMAGE):$(TAG) .
 
 push-image: build-image
 	docker push $(IMAGE):$(TAG)