diff --git a/Dockerfile b/Dockerfile index 99c524c..43270e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,20 @@ # Defines the tag for OBS and build script builds: -#!BuildTag: opensuse/tumbleweed/cdi-controller:%%PKG_VERSION%% -#!BuildTag: opensuse/tumbleweed/cdi-controller:%%PKG_VERSION%%.%RELEASE% +#!BuildTag: %%TAGPREFIX%%/cdi-controller:%%PKG_VERSION%% +#!BuildTag: %%TAGPREFIX%%/cdi-controller:%%PKG_VERSION%%.%RELEASE% # cdi-controller 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="Controller container for CDI" PREFIXEDLABEL org.opencontainers.image.description="Controller 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-controller:%%PKG_VERSION%%.%RELEASE%" +PREFIXEDLABEL org.opensuse.reference="%%TAGPREFIX%%/cdi-controller:%%PKG_VERSION%%.%RELEASE%" RUN zypper update -y && \ zypper install -y \ diff --git a/_service b/_service index f59d4a7..a914984 100644 --- a/_service +++ b/_service @@ -6,5 +6,12 @@ patch containerized-data-importer-controller - + + Dockerfile + TAGPREFIX + LABELPREFIX + source /usr/lib/obs/service/meta/virt-containers-meta + 1 + + diff --git a/cdi-controller-container.changes b/cdi-controller-container.changes index dd8ae90..35486b2 100644 --- a/cdi-controller-container.changes +++ b/cdi-controller-container.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 16 16:15:08 UTC 2021 - Vasily Ulyanov + +- Add placeholder vars to be replaced during build +- Use KUBEVIRTFROM to set the base image + ------------------------------------------------------------------- Fri Mar 12 09:45:15 UTC 2021 - Vasily Ulyanov