From e786940405ba2e704c0931bef39c79ae7388b86a3e7523be54eafcf4a0c30c7f Mon Sep 17 00:00:00 2001 From: Vasily Ulyanov Date: Wed, 19 Jan 2022 07:06:39 +0000 Subject: [PATCH] Accepting request 947345 from home:vulyanov:branches:Virtualization - Set default TARGETARCH=amd64 - Adjust indent OBS-URL: https://build.opensuse.org/request/show/947345 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-launcher-container?expand=0&rev=18 --- Dockerfile | 13 +++++++------ virt-launcher-container.changes | 6 ++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c5b4120..43d07d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,8 @@ ARG KUBEVIRTFROM FROM $KUBEVIRTFROM # TARGETARCH defined in prjconf, to handle architecture specific bits -# since TARGETARCH is not defined in OBS builds yet. -ARG TARGETARCH +# since TARGETARCH is not defined in OBS builds yet. Default to amd64. +ARG TARGETARCH=amd64 # labelprefix=%%LABELPREFIX%% PREFIXEDLABEL org.opencontainers.image.title="kubevirt virt-launcher container" @@ -39,17 +39,18 @@ RUN zypper -n install \ timezone \ vim \ xorriso + #!ArchExclusiveLine: x86_64 RUN if [ "$TARGETARCH" = "amd64" ]; then \ - zypper -n install qemu-x86 ; \ - fi; + zypper -n install qemu-x86 ; \ + fi; #!ArchExclusiveLine: aarch64 RUN if [ "$TARGETARCH" = "arm64" ]; then \ - zypper -n install \ + zypper -n install \ qemu-arm \ qemu-uefi-aarch64 ; \ - fi; + fi; RUN zypper clean -a && \ mkdir -p /usr/share/kubevirt/virt-launcher diff --git a/virt-launcher-container.changes b/virt-launcher-container.changes index 8c318da..0ecd384 100644 --- a/virt-launcher-container.changes +++ b/virt-launcher-container.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 19 06:48:50 UTC 2022 - Vasily Ulyanov + +- Set default TARGETARCH=amd64 +- Adjust indent + ------------------------------------------------------------------- Mon Jan 10 10:56:39 UTC 2022 - Guillaume GARDET