From dbf6161fa1167e023c0305c4bed655729c07727f Mon Sep 17 00:00:00 2001 From: Marco Jantke Date: Tue, 13 Jun 2017 15:16:08 +0200 Subject: [PATCH] always rebuild webui on 'make image' and introduce a new make target image-dirty that is used for the Traefik deployment. --- .travis.yml | 2 +- Makefile | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 071384c1b..8486af3d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_deploy: docker version; pip install --user -r requirements.txt; make -j${N_MAKE_JOBS} crossbinary-parallel; - make image; + make image-dirty; mkdocs build --clean; tar cfz dist/traefik-${VERSION}.src.tar.gz --exclude-vcs --exclude dist .; fi diff --git a/Makefile b/Makefile index ac629f1d0..22983700a 100644 --- a/Makefile +++ b/Makefile @@ -82,9 +82,15 @@ build-no-cache: dist shell: build ## start a shell inside the build env $(DOCKER_RUN_TRAEFIK) /bin/bash -image: binary ## build a docker traefik image +image-dirty: binary ## build a docker traefik image docker build -t $(TRAEFIK_IMAGE) . +image: clear-static binary ## clean up static directory and build a docker traefik image + docker build -t $(TRAEFIK_IMAGE) . + +clear-static: + rm -rf static + dist: mkdir dist