From adca33ea9c59f0a949017ec88db566ffd0fe0644 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 22 Aug 2018 23:24:19 +0000 Subject: [PATCH] Fix whitespace, add Dockerfile.engine to clean Signed-off-by: Eli Uriegas (cherry picked from commit 831482a3296e9a7b1ad10f6b8c850a7a4095b881) Signed-off-by: Eli Uriegas Upstream-commit: ce1d295cf4f7049dc48813d825511a85ebf7e9c1 Component: packaging --- components/packaging/image/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile index 89d4135ec1..9435288ad5 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -17,6 +17,7 @@ help: ## show make targets .PHONY: clean clean: ## remove build artifacts + -$(RM) $(ENGINE_DIR)/Dockerfile.engine -docker rmi $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION) -rm -f image-linux @@ -32,13 +33,13 @@ $(ENGINE_DIR)/Dockerfile.engine: image-linux: $(ENGINE_DIR)/Dockerfile.engine docker build -t $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) \ --build-arg GO_IMAGE="$(GO_IMAGE)" \ - --build-arg VERSION="$(STATIC_VERSION)" \ - --build-arg GITCOMMIT="$$(cd $(ENGINE_DIR) && git rev-parse --short=7 HEAD)" \ - --build-arg BUILDTIME="$(BUILDTIME)" \ - --build-arg PLATFORM="$(PLATFORM)" \ - --build-arg PRODUCT="$(PRODUCT)" \ - --build-arg DEFAULT_PRODUCT_LICENSE="$(DEFAULT_PRODUCT_LICENSE)" \ - --file $< $(ENGINE_DIR) + --build-arg VERSION="$(STATIC_VERSION)" \ + --build-arg GITCOMMIT="$$(cd $(ENGINE_DIR) && git rev-parse --short=7 HEAD)" \ + --build-arg BUILDTIME="$(BUILDTIME)" \ + --build-arg PLATFORM="$(PLATFORM)" \ + --build-arg PRODUCT="$(PRODUCT)" \ + --build-arg DEFAULT_PRODUCT_LICENSE="$(DEFAULT_PRODUCT_LICENSE)" \ + --file $< $(ENGINE_DIR) echo $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) > $@ engine-$(ARCH).tar: image-linux