From acc17c0b26a55f02ed62b0bd7b5eabe832d3f3d17cf703d8a0ee115d2e1ba7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 14 Oct 2024 11:31:13 +0000
Subject: [PATCH] [info=39927eacd6460414d7bd581c0ba1b16b]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/git-image?expand=0&rev=175
---
 _service          |  6 ------
 git-image.changes |  5 +++++
 git-image.kiwi    | 10 +++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/_service b/_service
index b10f8fb..69e9c85 100644
--- a/_service
+++ b/_service
@@ -12,10 +12,4 @@
     <param name="package">git-core</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">git-image.kiwi</param>
-    <param name="regex">%%git_minor_version%%</param>
-    <param name="package">git-core</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>
\ No newline at end of file
diff --git a/git-image.changes b/git-image.changes
index c390389..72c063b 100644
--- a/git-image.changes
+++ b/git-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
+
 -------------------------------------------------------------------
 Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 
diff --git a/git-image.kiwi b/git-image.kiwi
index d37f641..cd04398 100644
--- a/git-image.kiwi
+++ b/git-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: opensuse/git:%%git_minor_version%%-%RELEASE% opensuse/git:%%git_minor_version%% opensuse/git:%%git_major_version%% opensuse/git:%%git_version%% opensuse/git:latest -->
+<!-- OBS-AddTag: opensuse/git:%%git_version%%-%RELEASE% opensuse/git:%%git_version%% opensuse/git:2.47-%RELEASE% opensuse/git:2.47 opensuse/git:%%git_major_version%% opensuse/git:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="git-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
       <containerconfig
           name="opensuse/git"
-          tag="%%git_minor_version%%-%RELEASE%"
-          additionaltags="%%git_minor_version%%,%%git_major_version%%,%%git_version%%,latest">
+          tag="%%git_version%%-%RELEASE%"
+          additionaltags="%%git_version%%,2.47-%RELEASE%,2.47,%%git_major_version%%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.application.git">
             <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
@@ -39,8 +39,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
-            <label name="org.opencontainers.image.ref.name" value="%%git_minor_version%%-%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/git:%%git_minor_version%%-%RELEASE%"/>
+            <label name="org.opencontainers.image.ref.name" value="%%git_version%%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/git:%%git_version%%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="org.opensuse.release-stage" value="released"/>
             <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>