From bd0dd10e72d44ea5f7f25915f3872711ac3d9903 Mon Sep 17 00:00:00 2001
From: Mikkel Oscar Lyderik Larsen <mikkeloscar@users.noreply.github.com>
Date: Fri, 26 Jul 2019 20:36:03 +0200
Subject: [PATCH] Use proper tags for docker images (#66)

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
---
 delivery.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/delivery.yaml b/delivery.yaml
index 9f7d8bc..26d9157 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -18,7 +18,9 @@ pipeline:
     cmd: |
       if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
         IMAGE=registry-write.opensource.zalan.do/teapot/kube-metrics-adapter
+        VERSION=$(git describe --tags --always --dirty)
       else
         IMAGE=registry-write.opensource.zalan.do/teapot/kube-metrics-adapter-test
+        VERSION=$CDP_BUILD_VERSION
       fi
-      IMAGE=$IMAGE VERSION=$CDP_BUILD_VERSION make build.push
+      IMAGE=$IMAGE VERSION=$VERSION make build.push