From 6b9aa8a325aa8c588d0a2238004c275b395f8115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= <tom.erik.stower@entur.org>
Date: Fri, 3 Jan 2025 10:26:43 +0100
Subject: [PATCH] Fix image tagging

---
 .github/workflows/ci.yml | 3 ++-
 pom.xml                  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e0c705d1..47395e3d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,8 @@ jobs:
           cache: maven
       - name: set variables
         run: |
-          echo "GHA_DOCKER_PUSH_IMAGE_TAG=`date +%Y-%m-%dT%H-%M`" >> $GITHUB_ENV   
+          VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
+          echo "GHA_DOCKER_PUSH_IMAGE_TAG=v$VERSION-${{ github.run_id }}" >> $GITHUB_ENV
 
       - name: Build container image with Jib, push to container repo
         run: |
diff --git a/pom.xml b/pom.xml
index 69112668..1c584514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>no.rutebanken</groupId>
     <artifactId>uttu</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.1-SNAPSHOT2</version>
     <packaging>jar</packaging>
 
     <name>uttu</name>