Skip to content

Commit

Permalink
manifests: enable cliwrap on Fedora 40+
Browse files Browse the repository at this point in the history
As part of the bootable containers effort, we want to put emphasis on a
consistent experience when deriving images. A big part of that is being
able to type `dnf install -y ...` in one's `Containerfile`.

Let's turn on cliwrap for this. This was previously agreed[[1]], but
we ended never shipping it since there was a less invasive way to test
it.[[2]] Here, we bundle it as part of the Fedora 40 rebase. This will
naturally allow it to bake in `branched` and `next` for a while before
making it to `stable`.

Eventually, once dnf5 is ready, it could take on this role (including
package layering on the client-side), at which point we will no longer
need to wrap it.

[1]: coreos#830 (comment)
[2]: coreos#830 (comment)
  • Loading branch information
jlebon committed Feb 26, 2024
1 parent a980120 commit 1cfbd77
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions manifests/cliwrap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# https://github.com/coreos/fedora-coreos-tracker/issues/730
cliwrap: true
2 changes: 2 additions & 0 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ conditional-include:
- if: releasever == 39
# Checks for breaking changes that came with Podman v5.
include: podman-v5.yaml
- if: releasever >= 40
include: cliwrap.yaml

ostree-layers:
- overlay/15fcos
Expand Down
6 changes: 6 additions & 0 deletions tests/kola/extensions/package
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,9 @@ if [[ -n "${failed}" ]]; then
fatal "could not install: ${failed}"
fi
ok "successfully installed os rpm package extensions"

# also try the wrapped dnf
if jq -e .cliwrap /usr/share/rpm-ostree/treefile.json; then
dnf install -y 'ltrace'
ok "dnf cliwrap"
fi

0 comments on commit 1cfbd77

Please sign in to comment.