1
0

Accepting request 879581 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/879581
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-operator-container?expand=0&rev=5
This commit is contained in:
James Fehlig 2021-03-17 13:44:16 +00:00 committed by Git OBS Bridge
parent 03aa840bf0
commit 235466b364
3 changed files with 19 additions and 6 deletions

View File

@ -1,6 +1,6 @@
# Define the tags for OBS and build script builds: # Define the tags for OBS and build script builds:
#!BuildTag: opensuse/tumbleweed/virt-operator:%%PKG_VERSION%% #!BuildTag: %%TAGPREFIX%%/virt-operator:%%PKG_VERSION%%
#!BuildTag: opensuse/tumbleweed/virt-operator:%%PKG_VERSION%%.%RELEASE% #!BuildTag: %%TAGPREFIX%%/virt-operator:%%PKG_VERSION%%.%RELEASE%
# virt-operator container image # virt-operator container image
# KUBEVIRTFROM defined in prjconf, e.g. # KUBEVIRTFROM defined in prjconf, e.g.
@ -8,18 +8,18 @@
ARG KUBEVIRTFROM ARG KUBEVIRTFROM
FROM $KUBEVIRTFROM FROM $KUBEVIRTFROM
# labelprefix=org.opensuse.kubevirt # labelprefix=%%LABELPREFIX%%
PREFIXEDLABEL org.opencontainers.image.title="kubevirt virt-operator container" PREFIXEDLABEL org.opencontainers.image.title="kubevirt virt-operator container"
PREFIXEDLABEL org.opencontainers.image.description="Virtualization operator for kubevirt" PREFIXEDLABEL org.opencontainers.image.description="Virtualization operator for kubevirt"
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/virt-operator:%%PKG_VERSION%%.%RELEASE%" PREFIXEDLABEL org.opensuse.reference="%%TAGPREFIX%%/virt-operator:%%PKG_VERSION%%.%RELEASE%"
RUN zypper update -y && \ RUN zypper update -y && \
zypper install -y \ zypper install -y \
kubevirt-virt-operator \ kubevirt-virt-operator \
shadow && \ shadow && \
useradd --system --no-create-home -u 1001 virt-operator useradd --system --no-create-home -u 1001 virt-operator
USER 1001 USER 1001
ENTRYPOINT [ "/usr/bin/virt-operator" ] ENTRYPOINT [ "/usr/bin/virt-operator" ]

View File

@ -6,5 +6,12 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
<param name="package">kubevirt-virt-operator</param> <param name="package">kubevirt-virt-operator</param>
</service> </service>
<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"/> <service mode="buildtime" name="docker_label_helper"/>
</services> </services>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 17 07:11:30 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:04:54 UTC 2020 - James Fehlig <jfehlig@suse.com> Tue Nov 17 23:04:54 UTC 2020 - James Fehlig <jfehlig@suse.com>