From c1522e97803cafc68f962312744acfd9113a790642b0f2b18823e4dad3338d70 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Tue, 16 Mar 2021 20:17:42 +0000
Subject: [PATCH] Accepting request 879470 from
 home:vulyanov:branches:Virtualization

- Add placeholder vars to be replaced during build
- Use KUBEVIRTFROM to set the base image

OBS-URL: https://build.opensuse.org/request/show/879470
OBS-URL: https://build.opensuse.org/package/show/Virtualization/cdi-uploadserver-container?expand=0&rev=3
---
 Dockerfile                         | 13 ++++++++-----
 _service                           |  9 ++++++++-
 cdi-uploadserver-container.changes |  6 ++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 78704f5..8a44b52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,20 @@
 # Defines the tag for OBS and build script builds:
-#!BuildTag: opensuse/tumbleweed/cdi-uploadserver:%%PKG_VERSION%%
-#!BuildTag: opensuse/tumbleweed/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE%
+#!BuildTag: %%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%
+#!BuildTag: %%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE%
 
 # cdi-uploadserver container image
-FROM opensuse/tumbleweed
+# KUBEVIRTFROM defined in prjconf, e.g.
+#  BuildFlags: dockerarg:KUBEVIRTFROM=opensuse/tumbleweed
+ARG KUBEVIRTFROM
+FROM $KUBEVIRTFROM
 
-# labelprefix=org.opensuse.kubevirt
+# labelprefix=%%LABELPREFIX%%
 PREFIXEDLABEL org.opencontainers.image.title="CDI upload server container"
 PREFIXEDLABEL org.opencontainers.image.description="Upload server for the data fetching service for VM container images"
 PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%"
 PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%"
 PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%"
-PREFIXEDLABEL org.opensuse.reference="opensuse/tumbleweed/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE%"
+PREFIXEDLABEL org.opensuse.reference="%%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE%"
 
 RUN zypper update -y && \
     zypper install -y \
diff --git a/_service b/_service
index 50db348..a55e900 100644
--- a/_service
+++ b/_service
@@ -6,5 +6,12 @@
         <param name="parse-version">patch</param>
         <param name="package">containerized-data-importer-uploadserver</param>
     </service>
-    <service mode="buildtime" name="docker_label_helper"/> 
+    <service mode="buildtime" name="replace_using_env">
+        <param name="file">Dockerfile</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="verbose">1</param>
+    </service>
+    <service mode="buildtime" name="docker_label_helper"/>
 </services>
diff --git a/cdi-uploadserver-container.changes b/cdi-uploadserver-container.changes
index e8b18c7..b3b968f 100644
--- a/cdi-uploadserver-container.changes
+++ b/cdi-uploadserver-container.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 16 16:24:37 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Add placeholder vars to be replaced during build
+- Use KUBEVIRTFROM to set the base image
+
 -------------------------------------------------------------------
 Fri Mar 12 09:58:55 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>