Skip to content

Commit 524fdf5

Browse files
committed
feat(Makefile): set docker build flags via environment variable
This allows CI jobs to set the "--pull --no-cache" flags in particular. The "--rm" flag was removed since it's the default.
1 parent 1efbb2a commit 524fdf5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ services:
88
env:
99
# HACK(bacongobbler): make travis tests work
1010
- DEIS_REGISTRY=travis-ci/
11+
- DOCKER_BUILD_FLAGS="--pull --no-cache"
1112
install:
1213
- make docker-build
1314
script:

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ all: docker-build docker-push
2222
# For cases where we're building from local
2323
# We also alter the RC file to set the image name.
2424
docker-build:
25-
docker build --rm -t ${IMAGE} .
25+
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} .
2626
docker tag ${IMAGE} ${MUTABLE_IMAGE}
2727

2828
test: test-style test-unit test-functional

0 commit comments

Comments
 (0)