Verified Commit afb9a71f authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Updated and factorized Docker release CI job

parent aac80177
...@@ -118,7 +118,7 @@ pages: ...@@ -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: ...@@ -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: ...@@ -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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment