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
This commit is contained in:
James Fehlig 2021-03-16 20:17:42 +00:00 committed by Git OBS Bridge
parent 7d5dac021a
commit 219656225b
3 changed files with 22 additions and 6 deletions

View File

@ -1,17 +1,20 @@
# Defines the tag for OBS and build script builds: # Defines the tag for OBS and build script builds:
#!BuildTag: opensuse/tumbleweed/cdi-uploadserver:%%PKG_VERSION%% #!BuildTag: %%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%
#!BuildTag: opensuse/tumbleweed/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE% #!BuildTag: %%TAGPREFIX%%/cdi-uploadserver:%%PKG_VERSION%%.%RELEASE%
# cdi-uploadserver container image # 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.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.description="Upload server for the data fetching service for VM container images"
PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%" PREFIXEDLABEL org.opencontainers.image.created="%BUILDTIME%"
PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%" PREFIXEDLABEL org.opencontainers.image.version="%%PKG_VERSION%%.%RELEASE%"
PREFIXEDLABEL org.openbuildservice.disturl="%DISTURL%" 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 && \ RUN zypper update -y && \
zypper install -y \ zypper install -y \

View File

@ -6,5 +6,12 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
<param name="package">containerized-data-importer-uploadserver</param> <param name="package">containerized-data-importer-uploadserver</param>
</service> </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> </services>

View File

@ -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> Fri Mar 12 09:58:55 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>