.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