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

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

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

diff --git a/Dockerfile b/Dockerfile
index 8f08707..2d05cc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 # Defines the tag for OBS and build script builds:
 #!BuildTag: %%TAGPREFIX%%/cdi-controller:%%PKG_VERSION%%
 #!BuildTag: %%TAGPREFIX%%/cdi-controller:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: %%TAGPREFIX%%/cdi-controller:%%PKG_VERSION%%-%%PKG_RELEASE%%
 
 # cdi-controller container image
 # KUBEVIRTFROM defined in prjconf, e.g.
diff --git a/_service b/_service
index a914984..5cf7c9d 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-controller</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-controller 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-controller-container.changes b/cdi-controller-container.changes
index 3fc5d6e..01c5b0b 100644
--- a/cdi-controller-container.changes
+++ b/cdi-controller-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 28 16:29:21 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Tag the image with <version>-<release>
+
 -------------------------------------------------------------------
 Sun Apr 25 09:41:59 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>