Skip to content

Commit

Permalink
feat(Makefile): set docker build flags via environment variable
Browse files Browse the repository at this point in the history
This allows CI jobs to set the "--pull --no-cache" flags in
particular. The "--rm" flag was removed since it's the default.
  • Loading branch information
mboersma committed Jan 20, 2017
1 parent 1efbb2a commit 524fdf5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ services:
env:
# HACK(bacongobbler): make travis tests work
- DEIS_REGISTRY=travis-ci/
- DOCKER_BUILD_FLAGS="--pull --no-cache"
install:
- make docker-build
script:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ all: docker-build docker-push
# For cases where we're building from local
# We also alter the RC file to set the image name.
docker-build:
docker build --rm -t ${IMAGE} .
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} .
docker tag ${IMAGE} ${MUTABLE_IMAGE}

test: test-style test-unit test-functional
Expand Down

0 comments on commit 524fdf5

Please sign in to comment.