From f9b2da3eb7c288e110ce9549a13529e2e28ed41b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 8 Dec 2023 17:06:48 +0530 Subject: [PATCH] [CI:BUILD] override crun-wasm in fcos + podman-next image build crun-wasm depends on the same epoch:version-release as crun so overriding `crun` but not `crun-wasm` will cause installation issues like: ``` error: Could not depsolve transaction; 1 problem detected: Problem: package crun-wasm-1.11.1-1.fc39.x86_64 from @System requires crun = 1.11.1-1.fc39, but none of the providers can be installed - cannot install both crun-102:1.12-1.20231205201336970037.main.19.g90b21dd.fc39.x86_64 from @commandline and crun-1.11.1-1.fc39.x86_64 from @System - cannot install both crun-102:1.12-1.20231205201336970037.main.19.g90b21dd.fc39.x86_64 from @commandline and crun-1.11.1-1.fc39.x86_64 from updates-archive - conflicting requests ``` This commit overrides both crun and crun-wasm from what's found in podman-next. Signed-off-by: Lokesh Mandvekar --- contrib/podman-next/fcos-podmanimage/Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/podman-next/fcos-podmanimage/Containerfile b/contrib/podman-next/fcos-podmanimage/Containerfile index 5412fb687d..b02b0d942c 100644 --- a/contrib/podman-next/fcos-podmanimage/Containerfile +++ b/contrib/podman-next/fcos-podmanimage/Containerfile @@ -13,8 +13,8 @@ ADD https://download.copr.fedorainfracloud.org/results/rhcontainerbot/podman-nex # Note: Currently does not result in a size reduction for the container image RUN rpm-ostree override replace --experimental --freeze \ --from repo="copr:copr.fedorainfracloud.org:rhcontainerbot:podman-next" \ - aardvark-dns containers-common containers-common-extra crun netavark podman && \ - rpm-ostree install crun-wasm wasmedge-rt && \ + aardvark-dns containers-common containers-common-extra crun crun-wasm netavark podman && \ + rpm-ostree install wasmedge-rt && \ rpm-ostree override remove moby-engine containerd runc && \ ostree container commit