Accepting request 1098519 from home:vulyanov:branches:Virtualization
- Drop TARGETARCH argument (detect arch during build) OBS-URL: https://build.opensuse.org/request/show/1098519 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-libguestfs-tools-container?expand=0&rev=20
This commit is contained in:
parent
376010e355
commit
f0759c9000
15
Dockerfile
15
Dockerfile
@ -10,9 +10,6 @@
|
||||
# BuildFlags: dockerarg:KUBEVIRTFROM=opensuse/tumbleweed
|
||||
ARG KUBEVIRTFROM
|
||||
FROM $KUBEVIRTFROM
|
||||
# TARGETARCH defined in prjconf, to handle architecture specific bits
|
||||
# since TARGETARCH is not defined in OBS builds yet. Default to amd64.
|
||||
ARG TARGETARCH=amd64
|
||||
|
||||
# Mandatory labels for the build service:
|
||||
# https://en.opensuse.org/Building_derived_containers
|
||||
@ -57,15 +54,15 @@ RUN zypper -n install \
|
||||
zerofree
|
||||
|
||||
#!ArchExclusiveLine: x86_64
|
||||
RUN if [ "$TARGETARCH" = "amd64" ]; then \
|
||||
zypper -n install qemu-x86 ; \
|
||||
fi;
|
||||
RUN if [ "$(uname -m)" = "x86_64" ]; then \
|
||||
zypper -n install qemu-x86 ; \
|
||||
fi;
|
||||
|
||||
# qemu-x86 is required on aarch64 to get the test to pass (allow fallback to non KVM mode)
|
||||
#!ArchExclusiveLine: aarch64
|
||||
RUN if [ "$TARGETARCH" = "arm64" ]; then \
|
||||
zypper -n install qemu-arm qemu-uefi-aarch64 qemu-x86; \
|
||||
fi;
|
||||
RUN if [ "$(uname -m)" = "aarch64" ]; then \
|
||||
zypper -n install qemu-arm qemu-uefi-aarch64 qemu-x86; \
|
||||
fi;
|
||||
|
||||
# Make a "fixed appliance" for libguestfs.
|
||||
# Note: the resulting 'appliance/root' is a sparse file. Docker does not
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 12 06:55:40 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
- Drop TARGETARCH argument (detect arch during build)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 2 18:15:49 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user