Accepting request 879578 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/879578 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-controller-container?expand=0&rev=4
This commit is contained in:
parent
31be7b045e
commit
f053a609e9
10
Dockerfile
10
Dockerfile
@ -1,6 +1,6 @@
|
|||||||
# Defines the tags for OBS and build script builds:
|
# Defines the tags for OBS and build script builds:
|
||||||
#!BuildTag: opensuse/tumbleweed/virt-controller:%%PKG_VERSION%%
|
#!BuildTag: %%TAGPREFIX%%/virt-controller:%%PKG_VERSION%%
|
||||||
#!BuildTag: opensuse/tumbleweed/virt-controller:%%PKG_VERSION%%.%RELEASE%
|
#!BuildTag: %%TAGPREFIX%%/virt-controller:%%PKG_VERSION%%.%RELEASE%
|
||||||
|
|
||||||
# virt-controller container image
|
# virt-controller 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-controller container"
|
PREFIXEDLABEL org.opencontainers.image.title="kubevirt virt-controller container"
|
||||||
PREFIXEDLABEL org.opencontainers.image.description="Virtualization controller for kubevirt"
|
PREFIXEDLABEL org.opencontainers.image.description="Virtualization controller 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-controller:%%PKG_VERSION%%.%RELEASE%"
|
PREFIXEDLABEL org.opensuse.reference="%%TAGPREFIX%%/virt-controller:%%PKG_VERSION%%.%RELEASE%"
|
||||||
|
|
||||||
RUN zypper update -y && \
|
RUN zypper update -y && \
|
||||||
zypper install -y \
|
zypper install -y \
|
||||||
kubevirt-virt-controller \
|
kubevirt-virt-controller \
|
||||||
shadow && \
|
shadow && \
|
||||||
useradd -u 1001 --create-home -s /bin/bash virt-controller
|
useradd -u 1001 --create-home -s /bin/bash virt-controller
|
||||||
USER 1001
|
USER 1001
|
||||||
ENTRYPOINT [ "/usr/bin/virt-controller" ]
|
ENTRYPOINT [ "/usr/bin/virt-controller" ]
|
||||||
|
9
_service
9
_service
@ -6,5 +6,12 @@
|
|||||||
<param name="parse-version">patch</param>
|
<param name="parse-version">patch</param>
|
||||||
<param name="package">kubevirt-virt-controller</param>
|
<param name="package">kubevirt-virt-controller</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>
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 17 07:02:24 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:00:12 UTC 2020 - James Fehlig <jfehlig@suse.com>
|
Tue Nov 17 23:00:12 UTC 2020 - James Fehlig <jfehlig@suse.com>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user