From f8a61655d18051878b3268a46c799c9d6cc2e48539e7e30dc38c67d6ca2ad068 Mon Sep 17 00:00:00 2001
From: Vasily Ulyanov <vasily.ulyanov@suse.com>
Date: Tue, 4 May 2021 15:33:27 +0000
Subject: [PATCH] Accepting request 890442 from
 home:vulyanov:branches:Virtualization

- Tag the image with <version>-<release>

OBS-URL: https://build.opensuse.org/request/show/890442
OBS-URL: https://build.opensuse.org/package/show/Virtualization/cdi-uploadserver-container?expand=0&rev=7
---
 Dockerfile                         |  1 +
 _service                           | 11 ++++-------
 cdi-uploadserver-container.changes |  5 +++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b32e8c4..96a1191 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 # Defines the tag for OBS and build script builds:
 #!BuildTag: %%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%
 #!BuildTag: %%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: %%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%-%%PKG_RELEASE%%
 
 # cdi-uploadserver container image
 # KUBEVIRTFROM defined in prjconf, e.g.
diff --git a/_service b/_service
index a55e900..3ea6f39 100644
--- a/_service
+++ b/_service
@@ -1,16 +1,13 @@
 <services>
     <service mode="buildtime" name="kiwi_metainfo_helper"/>
-    <service name="replace_using_package_version" mode="buildtime">
-        <param name="file">Dockerfile</param>
-        <param name="regex">%%PKG_VERSION%%</param>
-        <param name="parse-version">patch</param>
-        <param name="package">containerized-data-importer-uploadserver</param>
-    </service>
+    <service mode="buildtime" name="cdi_containers_meta"/>
     <service mode="buildtime" name="replace_using_env">
         <param name="file">Dockerfile</param>
+        <param name="var">PKG_VERSION</param>
+        <param name="var">PKG_RELEASE</param>
         <param name="var">TAGPREFIX</param>
         <param name="var">LABELPREFIX</param>
-        <param name="eval">source /usr/lib/obs/service/meta/virt-containers-meta</param>
+        <param name="eval">pkg=containerized-data-importer-uploadserver source /usr/lib/obs/service/cdi_containers_meta</param>
         <param name="verbose">1</param>
     </service>
     <service mode="buildtime" name="docker_label_helper"/>
diff --git a/cdi-uploadserver-container.changes b/cdi-uploadserver-container.changes
index d4764f6..31c203b 100644
--- a/cdi-uploadserver-container.changes
+++ b/cdi-uploadserver-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 28 16:35:25 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Tag the image with <version>-<release>
+
 -------------------------------------------------------------------
 Sun Apr 25 09:45:47 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>