Skip to content

Commit

Permalink
[CI:BUILD] override crun-wasm in fcos + podman-next image build
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
lsm5 committed Dec 8, 2023
1 parent deab493 commit f9b2da3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/podman-next/fcos-podmanimage/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit f9b2da3

Please sign in to comment.