From 99a5ba61ee43ae74812950e1df92a920b131911de77ecd5028f64e7a26de8634 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Mon, 2 Nov 2020 15:10:09 +0000 Subject: [PATCH] Accepting request 845459 from home:jzerebecki:branches:Virtualization - remove require on libnettle6 as I don't see what whould need it and it is only a library which should be pulled in by anything that needs it - link genisoimage to mkisofs, as we don't have cdrkit packaged right now - replace sle with opensuse OBS-URL: https://build.opensuse.org/request/show/845459 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-launcher-container?expand=0&rev=2 --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f4bdf3..dcf92d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,21 @@ # Define the tags for OBS and build script builds: -#!BuildTag: suse/sles/15.2/virt-launcher:%%PKG_VERSION%% -#!BuildTag: suse/sles/15.2/virt-launcher:%%PKG_VERSION%%.%RELEASE% +#!BuildTag: opensuse/tumbleweed/virt-launcher:%%PKG_VERSION%% +#!BuildTag: opensuse/tumbleweed/virt-launcher:%%PKG_VERSION%%.%RELEASE% # virt-launcher container image FROM opensuse/tumbleweed -# labelprefix=com.suse.kubevirt +# labelprefix=org.opensuse.kubevirt 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="suse/sles/15.2/virt-launcher:%%PKG_VERSION%%.%RELEASE%" +PREFIXEDLABEL org.opensuse.reference="opensuse/tumbleweed/virt-launcher:%%PKG_VERSION%%.%RELEASE%" RUN zypper update -y && \ zypper install -y \ - libnettle6 \ - socat \ + socat \ qemu-x86 \ qemu-tools \ libcap-progs \ @@ -37,5 +36,6 @@ COPY augconf /augconf RUN augtool -f /augconf RUN cd /var && rm -rf run && ln -s ../run . +RUN ln -s /usr/bin/mkisofs /usr/bin/genisoimage ENTRYPOINT [ "/usr/bin/virt-launcher" ]