From 58bb233f7dda26db469beba884dc7b426491ffd8 Mon Sep 17 00:00:00 2001 From: Alessandro Di Stefano Date: Wed, 23 Aug 2023 10:15:23 +0200 Subject: [PATCH] Fix fcos-base-image Containerfile (#16) nfs-utils-coreos conflicts with nfs-utils, dependency of several packages. Although some packages can be removed in favor of running their services on top of containers (see coreos/fedora-coreos-tracker#572), nfs-utils is still a dependency for other packages we need to install in the host. --- images/fcos-base-image/Containerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images/fcos-base-image/Containerfile b/images/fcos-base-image/Containerfile index 508eda1..0849c8d 100644 --- a/images/fcos-base-image/Containerfile +++ b/images/fcos-base-image/Containerfile @@ -12,10 +12,14 @@ RUN set -x; arch=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/'); cat /etc/ https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \ && ostree container commit +# Replacing nfs-utils-coreos with nfs-utils as some required packages (e.g., libvirt) depend on it: see coreos/fedora-coreos-tracker#572 +# Also, installing nfs-utils will leave content in /var. `rm -rf /var/*` is a workaround until the packages are fixed. +RUN rpm-ostree uninstall nfs-utils-coreos && rpm-ostree install nfs-utils && rm -rf /var/* && ostree container commit + RUN set -x; PACKAGES_INSTALL="bridge-utils conntrack-tools curl fping iftop iputils iproute mtr nethogs socat"; \ rpm-ostree install $PACKAGES_INSTALL && ostree container commit -RUN set -x; PACKAGES_INSTALL="chrony targetd targetcli"; \ +RUN set -x; PACKAGES_INSTALL="chrony targetcli"; \ rpm-ostree install $PACKAGES_INSTALL && rm -rf /var/* && ostree container commit RUN set -x; PACKAGES_INSTALL="net-tools bind-utils iperf iperf3 iputils mtr ethtool tftp wget ipmitool"; \