Merge pull request #1205 from mboersma/build-no-cache

fix(Makefile): build docker image with --no-cache by default

Author: mboersma

Makefile

@@ -27,7 +27,7 @@ check-docker:
 build: docker-build
 
 docker-build: check-docker
-	docker build --rm -t ${IMAGE} rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 deploy: check-kubectl docker-build docker-push

versioning.mk

@@ -1,5 +1,6 @@
 MUTABLE_VERSION ?= canary
 VERSION ?= git-$(shell git rev-parse --short HEAD)
+DOCKER_BUILD_FLAGS ?= --no-cache
 
 IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
 MUTABLE_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}