Updated and factorized Docker release CI job

This commit is contained in:
Eliot Berriot 2018-06-09 16:50:34 +02:00
parent aac80177f5
commit afb9a71fd2
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 3 additions and 18 deletions

View File

@ -118,7 +118,7 @@ pages:
tags: tags:
- docker - docker
docker_develop: docker_release:
stage: deploy stage: deploy
before_script: before_script:
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
@ -129,8 +129,9 @@ docker_develop:
- docker push $IMAGE - docker push $IMAGE
only: only:
- develop@funkwhale/funkwhale - develop@funkwhale/funkwhale
- tags@funkwhale/funkwhale
tags: tags:
- dind - docker-build
build_api: build_api:
# Simply publish a zip containing api/ directory # Simply publish a zip containing api/ directory
@ -145,19 +146,3 @@ build_api:
- tags@funkwhale/funkwhale - tags@funkwhale/funkwhale
- master@funkwhale/funkwhale - master@funkwhale/funkwhale
- develop@funkwhale/funkwhale - develop@funkwhale/funkwhale
docker_release:
stage: deploy
before_script:
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- cp -r front/dist api/frontend
- cd api
script:
- docker build -t $IMAGE -t $IMAGE_LATEST .
- docker push $IMAGE
- docker push $IMAGE_LATEST
only:
- tags@funkwhale/funkwhale
tags:
- dind