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
  • Loading branch information
mboersma committed Jan 20, 2017
1 parent f0e1ef9 commit 4f46069
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 @@ -10,6 +10,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 @@ -35,7 +35,7 @@ build: check-docker
# For cases where we're building from local
# We also alter the RC file to set the image name.
docker-build: check-docker build
docker build --rm -t ${IMAGE} rootfs
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
docker tag ${IMAGE} ${MUTABLE_IMAGE}

build-binary:
Expand Down

0 comments on commit 4f46069

Please sign in to comment.