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

Merge branch 'develop'

Browse source
This commit is contained in:
Sonja Happ 2019-11-04 15:58:17 +01:00
commit c3e34cbccc
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
.gitlab-ci.yml
View file

@ -16,7 +16,7 @@ stages:
- prepare
- build
- test
- deploy
# - deploy
prepare:
stage: prepare
@ -51,16 +51,16 @@ test_job:
tags:
- docker
deploy:docker:
stage: deploy
script:
- docker build -t ${DOCKER_IMAGE} -f packaging/docker/Dockerfile .
- docker tag villas/web:${DOCKER_TAG} villas/web:latest
- docker push villas/web:${DOCKER_TAG}
- docker push villas/web:latest
tags:
- shell
- linux
only:
refs:
- master
#deploy:docker:
# stage: deploy
# script:
# - docker build -t ${DOCKER_IMAGE} -f packaging/docker/Dockerfile .
# - docker tag villas/web:${DOCKER_TAG} villas/web:latest
# - docker push villas/web:${DOCKER_TAG}
# - docker push villas/web:latest
# tags:
# - shell
# - linux
# only:
# refs:
# - master