Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

docker: tag images also with "latest" tag

Browse source
This commit is contained in:
Steffen Vogel 2018-05-24 09:09:54 +02:00
parent 9e7bde5efa
commit 07ce4e9229
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packaging/docker/Makefile.inc
View file

@ -30,6 +30,10 @@ DOCKER_TARGETS = docker-app docker-dev docker-dev-centos docker-dev-ubuntu
DOCKER_RUN_TARGETS = $(addprefix run-,$(DOCKER_TARGETS))
DOCKER_DEPLOY_TARGETS = $(addprefix deploy-,$(DOCKER_TARGETS))
ifneq ($(CI_COMMIT_TAG),)
DOCKER_OPTS += --tag $(DOCKER_IMAGE)-$*:$(CI_COMMIT_TAG)
endif
DOCKER_RUN_OPTS = --interactive --tty \
--publish 80:80 --publish 443:443 --publish 12000:12000/udp --publish 12001:12001/udp \
--privileged --security-opt seccomp:unconfined --volume "$(SRCDIR):/villas"
@ -39,6 +43,7 @@ run-docker: run-docker-app
deploy-docker: deploy-docker-app
docker: docker-app
$(DOCKER) tag $(DOCKER_IMAGE)-app:$(DOCKER_TAG) $(DOCKER_IMAGE):$(DOCKER_TAG)
$(DOCKER) tag $(DOCKER_IMAGE)-app:$(DOCKER_TAG) $(DOCKER_IMAGE):latest
.PHONY: docker run-docker deploy-docker
@ -50,10 +55,6 @@ $(DOCKER_RUN_TARGETS): run-docker-%: docker-%
$(DOCKER_TARGETS): docker-%: $(BUILDDIR)/packaging/docker/Image.%
ifneq ($(CI_COMMIT_TAG),)
DOCKER_OPTS += --tag $(DOCKER_IMAGE)-$*:$(CI_COMMIT_TAG)
endif
# The docker build targets use the --iidfile option to write the newly build image
# id to an file. Make is using the modification timestamp of this file and the Dockerfile
# to determine when the image needs to be rebuild.