From 555cb85122fbaf891cf0e172b79d2decb3130786 Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Tue, 12 Nov 2019 18:05:22 +0100
Subject: [PATCH] chg: pkg: more human release name for git tag and docker
 image name.

---
 .drone.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 41b8a8d..95eab55 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,17 +25,24 @@ steps:
             User mirror
             Port 10022
         EOF
-      ## Warning: without 'ssh://', the port doesn't see to be used and it tries to
-      ## connect to git.0k.io:22 (ssh fingerprint allows to infer this).
       - DEBUG=1 freeze docker.0k.io git.0k.io:/var/git/mirror
       - docker push "$(cat image)" ## this will push the new onbuild image
-      - docker push "docker.0k.io/mirror/$(cat release)"
+      - docker push "docker.0k.io/mirror/odoo/$(cat release)"
+      - docker tag  "docker.0k.io/mirror/odoo/$(cat
+        release)"  "docker.0k.io/mirror/odoo:${DRONE_COMMIT_BRANCH//\//_}"
+      - docker push "docker.0k.io/mirror/odoo:${DRONE_COMMIT_BRANCH//\//_}"
+      ## Warning: without 'ssh://', the port doesn't see to be used and it tries to
+      ## connect to git.0k.io:22 (ssh fingerprint allows to infer this).
       - |
         release=$(cat release)
         git checkout -b "tmp"
         git commit -am "chg: pkg: release freezing in $release"
-        git tag "$release"
-        git push "${DRONE_GIT_SSH_URL}" "$release"
+        git tag "release/candidate/$release"
+        git push "${DRONE_GIT_SSH_URL}" "release/candidate/$release"
+      - |
+        release=$(cat release)
+        echo "PUSHED DOCKER IMAGE: docker.0k.io/mirror/odoo/$release"
+        echo "PUSHED GIT TAG: release/candidate/$release"
 
 volumes:
   - name: docker