From afb9a71fd2d299e0ae2c3fed3799a1da68e3d9d1 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 9 Jun 2018 16:50:34 +0200
Subject: [PATCH] Updated and factorized Docker release CI job
---
.gitlab-ci.yml | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e56fa6e16..76b522c806 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,7 +118,7 @@ pages:
tags:
- docker
-docker_develop:
+docker_release:
stage: deploy
before_script:
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
@@ -129,8 +129,9 @@ docker_develop:
- docker push $IMAGE
only:
- develop@funkwhale/funkwhale
+ - tags@funkwhale/funkwhale
tags:
- - dind
+ - docker-build
build_api:
# Simply publish a zip containing api/ directory
@@ -145,19 +146,3 @@ build_api:
- tags@funkwhale/funkwhale
- master@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
--
GitLab