From 5a88369aae0496879fd5a946dcdde064a746efc8 Mon Sep 17 00:00:00 2001
From: Tim Izzo <tim@octree.ch>
Date: Fri, 24 Jul 2020 08:31:18 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20Set=20pipeline=20for=20productio?=
 =?UTF-8?q?n=20on=20tags?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0427b8c..b915abd4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,7 @@ Build:
   image: docker:stable-git
   rules:
     - if: '$CI_COMMIT_REF_NAME == "master"'
+    - if: '$CI_COMMIT_TAG =~ /v.*$/'
   script:
     - docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p$CI_REGISTRY_PASSWORD
     - docker pull $CI_REGISTRY_IMAGE:latest || true
@@ -94,13 +95,9 @@ Deploy to Production:
   environment:
     name: production
     url: $ENV_URL
-  # rules:
-  #   - if: "$CI_COMMIT_TAG =~ /v.*[^r][^c]$/"
-  #     when: manual
+  rules:
+    - if: "$CI_COMMIT_TAG =~ /v.*[^r][^c]$/"
   image: mwienk/jelastic-cli
-  when: manual
-  variables:
-    CI_COMMIT_TAG: latest # Avant de mettre en place le système de tag, on redéploie toujours le tag latest
   script:
     - /root/jelastic/users/authentication/signin --login $JELASTIC_LOGIN --password $JELASTIC_PASSWORD --platformUrl ${JELASTIC_HOSTER:-app.hidora.com}
     - /root/jelastic/environment/control/redeploycontainerbyid --envName $JELASTIC_ENVNAME --nodeId $JELASTIC_NODEID --tag ${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --useExistingVolumes ${USE_EXISTING_VOLUME:-true}
-- 
GitLab