1
0

Accepting request 879580 from home:vulyanov:branches:Virtualization

- Add placeholder vars to be replaced during build
- Fix mixed tabs and spaces

OBS-URL: https://build.opensuse.org/request/show/879580
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-launcher-container?expand=0&rev=4
This commit is contained in:
James Fehlig 2021-03-17 13:43:35 +00:00 committed by Git OBS Bridge
parent 537296b16c
commit b84d93b30a
3 changed files with 21 additions and 8 deletions

View File

@ -1,6 +1,6 @@
# Define the tags for OBS and build script builds:
#!BuildTag: opensuse/tumbleweed/virt-launcher:%%PKG_VERSION%%
#!BuildTag: opensuse/tumbleweed/virt-launcher:%%PKG_VERSION%%.%RELEASE%
#!BuildTag: %%TAGPREFIX%%/virt-launcher:%%PKG_VERSION%%
#!BuildTag: %%TAGPREFIX%%/virt-launcher:%%PKG_VERSION%%.%RELEASE%
# virt-launcher container image
# KUBEVIRTFROM defined in prjconf, e.g.
@ -8,13 +8,13 @@
ARG KUBEVIRTFROM
FROM $KUBEVIRTFROM
# labelprefix=org.opensuse.kubevirt
# labelprefix=%%LABELPREFIX%%
PREFIXEDLABEL org.opencontainers.image.title="kubevirt virt-launcher container"
PREFIXEDLABEL org.opencontainers.image.description="Container to host VM processes for kubevirt"
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/virt-launcher:%%PKG_VERSION%%.%RELEASE%"
PREFIXEDLABEL org.opensuse.reference="%%TAGPREFIX%%/virt-launcher:%%PKG_VERSION%%.%RELEASE%"
RUN zypper update -y && \
zypper install -y \
@ -30,9 +30,9 @@ RUN zypper update -y && \
libvirt-daemon-qemu \
libvirt-client \
libvirt-daemon-driver-storage-core \
vim \
kubevirt-container-disk \
kubevirt-virt-launcher && \
vim \
kubevirt-container-disk \
kubevirt-virt-launcher && \
mkdir -p /usr/share/kubevirt/virt-launcher
COPY augconf /augconf

View File

@ -6,5 +6,12 @@
<param name="parse-version">patch</param>
<param name="package">kubevirt-virt-launcher</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>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 17 07:08:54 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Add placeholder vars to be replaced during build
- Fix mixed tabs and spaces
-------------------------------------------------------------------
Tue Nov 17 23:03:31 UTC 2020 - James Fehlig <jfehlig@suse.com>