From eccafe145b45a21d61e9d6a8ee9846502da9b43d Mon Sep 17 00:00:00 2001
From: FyloZ <fylozdev@gmail.com>
Date: Tue, 10 Aug 2021 20:43:55 -0400
Subject: [PATCH] Update CI/CD

---
 .drone.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d97b6e1..11396c2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 ---
 global-variables:
-  release: &release ${DRONE_BRANCH##/**}
+  release: &release ${DRONE_BRANCH##**/}
   environment: &environment
     CRE_REGISTRY_IMAGE: registry.fyloz.dev:5443/colorrecipesexplorer/frontend
     CRE_PORT: 9102
@@ -31,7 +31,7 @@ steps:
     when:
       branch: release/**
 
-  - name: containerize-dev
+  - name: containerize
     image: plugins/docker
     environment:
       <<: *environment
@@ -55,7 +55,7 @@ steps:
         from_secret: deploy_server_ssh_port
       DEPLOY_SERVER_SSH_KEY:
         from_secret: deploy_server_ssh_key
-      DEPLOY_CONTAINER_NAME: cre_frontend-${DRONE_BRANCH}
+      DEPLOY_CONTAINER_NAME: cre_frontend
     commands:
       - apk update
       - apk add --no-cache openssh-client
@@ -71,7 +71,9 @@ steps:
       - ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker run -d -p $CRE_PORT:80 --name=$DEPLOY_CONTAINER_NAME $CRE_REGISTRY_IMAGE:$CRE_RELEASE"
     when:
       branch: release/**
+
 trigger:
   branch:
     - develop
+    - release/**
     - master