forked from pool/virt-launcher-container
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
This commit is contained in:
parent
9b897b7925
commit
e786940405
13
Dockerfile
13
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
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 19 06:48:50 UTC 2022 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
- Set default TARGETARCH=amd64
|
||||
- Adjust indent
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 10 10:56:39 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user