always rebuild webui on 'make image'

and introduce a new make target image-dirty that is used for the Traefik
deployment.
This commit is contained in:
Marco Jantke 2017-06-13 15:16:08 +02:00 committed by Ludovic Fernandez
parent 7aabd6e385
commit dbf6161fa1
2 changed files with 8 additions and 2 deletions

View file

@ -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

View file

@ -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