From 9d052da590ae2f3c998e8e351c55024ebdc0c071 Mon Sep 17 00:00:00 2001 From: Martin Necas Date: Mon, 20 Jan 2025 13:05:05 +0100 Subject: [PATCH] Add latest win-virtio Signed-off-by: Martin Necas --- build/virt-v2v/Containerfile-upstream | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build/virt-v2v/Containerfile-upstream b/build/virt-v2v/Containerfile-upstream index edf745afe..797321e07 100644 --- a/build/virt-v2v/Containerfile-upstream +++ b/build/virt-v2v/Containerfile-upstream @@ -10,7 +10,7 @@ RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o image-converter ./cmd/i RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper ./cmd/virt-v2v/entrypoint.go # Main container -FROM quay.io/centos/centos:stream9-minimal +FROM quay.io/centos/centos:stream9 RUN rm /etc/pki/tls/fips_local.cnf && \ echo -e '[fips_sect]\ntls1-prf-ems-check = 0\nactivate = 1' > /etc/pki/tls/fips_local.cnf && \ sed -i '/^\\[ crypto_policy \\]/a Options=RHNoEnforceEMSinFIPS' /etc/pki/tls/openssl.cnf @@ -19,13 +19,14 @@ ENV LIBGUESTFS_BACKEND=direct LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 RUN mkdir /disks && \ source /etc/os-release && \ - microdnf install -y \ - virt-v2v \ - virtio-win && \ - microdnf clean all + dnf install -y \ + virt-v2v && \ + dnf clean all -RUN ( [ "$(rpm -q glibc)" == "glibc-2.34-66.el9.x86_64" ] && microdnf -y downgrade glibc-2.34-65.el9.x86_64 || true ) && \ -microdnf -y install libguestfs libguestfs-appliance libguestfs-xfs libguestfs-winsupport qemu-img supermin && \ +RUN dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/virtio-win/1.9.40/1.el9/noarch/virtio-win-1.9.40-1.el9.noarch.rpm + +RUN ( [ "$(rpm -q glibc)" == "glibc-2.34-66.el9.x86_64" ] && dnf -y downgrade glibc-2.34-65.el9.x86_64 || true ) && \ +dnf -y install libguestfs libguestfs-appliance libguestfs-xfs libguestfs-winsupport qemu-img supermin && \ depmod $(ls /lib/modules/ |tail -n1) # Create tarball for the appliance.