From 289be0c01457ae5bf02c7dba27cb8b104195d466 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 19 Sep 2023 15:36:43 -0400 Subject: [PATCH] [CI:BUILD] FCOS + podman-next image: pull in wasm This commit installs `crun-wasm` and `wasmedge-rt` in the FCOS image at https://quay.io/repository/podman/fcos . - crun-wasm is installed from rhcontainerbot/podman-next - wasmedge-rt is installed from the official Fedora repos Packages in Containerfile have also been rearranged in alphabetical order. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar --- contrib/podman-next/fcos-podmanimage/Containerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/podman-next/fcos-podmanimage/Containerfile b/contrib/podman-next/fcos-podmanimage/Containerfile index 99584e0712..5412fb687d 100644 --- a/contrib/podman-next/fcos-podmanimage/Containerfile +++ b/contrib/podman-next/fcos-podmanimage/Containerfile @@ -7,12 +7,14 @@ FROM quay.io/fedora/fedora-coreos:stable ADD https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-rawhide/rhcontainerbot-podman-next-fedora-rawhide.repos /etc/yum.repos.d/rhcontainerbot-podman-next-fedora.repo ADD https://download.copr.fedorainfracloud.org/results/rhcontainerbot/podman-next/pubkey.gpg /etc/pki/rpm-gpg/rhcontainerbot-podman-next-fedora.gpg -# Replace aardvark-dns, conmon, crun, netavark, podman, containers-common +# Replace aardvark-dns, containers-common[-extra], crun, netavark, podman +# Install crun-wasm and wasmedge-rt # Remove moby-engine, containerd, runc # 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 crun netavark podman containers-common containers-common-extra && \ + aardvark-dns containers-common containers-common-extra crun netavark podman && \ + rpm-ostree install crun-wasm wasmedge-rt && \ rpm-ostree override remove moby-engine containerd runc && \ ostree container commit