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

feat(Makefile): set docker build flags via environment variable
deis · Jan 25, 2017 · 923e82e · 923e82e
2 parents 75a0123 + b2fc347
commit 923e82e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,8 @@ cache:
     - vendor
 services:
   - docker
+env:
+  - DOCKER_BUILD_FLAGS="--pull --no-cache"
 sudo: required
 install:
   - make bootstrap

diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ test-cover:
 
 docker-build: build
 	# build the main image
-	docker build --rm -t ${IMAGE} rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 deploy: build docker-build docker-push