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 @@ patch containerized-data-importer-uploadserver - + + Dockerfile + TAGPREFIX + LABELPREFIX + source /usr/lib/obs/service/meta/virt-containers-meta + 1 + + 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 + +- 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