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

mboersma · web-flow · commit ec3c26cfd503 · 2017-01-25T09:50:46.000-07:00
feat(Makefile): set docker build flags via environment variable
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,8 @@ cache:
 sudo: required
 services:
   - docker
+env:
+  - DOCKER_BUILD_FLAGS="--pull --no-cache"
 install:
   - make bootstrap
 script:
diff --git a/Makefile b/Makefile
@@ -65,7 +65,7 @@ build-with-container: check-docker
 docker-build: build-with-container build-image
 
 build-image:
-	docker build -t ${IMAGE} rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 clean: check-docker
diff --git a/versioning.mk b/versioning.mk
@@ -20,4 +20,3 @@ docker-immutable-push:
 .PHONY: docker-mutable-push
 docker-mutable-push:
 	docker push ${MUTABLE_IMAGE}
-	
