From 5dbcd377c60b816a6aedf76a4c9b7fc42aa09438 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 19 Nov 2021 02:29:30 +0100 Subject: [PATCH] images: Ensure that coreutils-single is replaced by coreutils-full It's true that the fedora base images no longer come with coreutils-single, but they used to, and the ubi base images still do. Therefore, it's worth being extra defensive about this. It's better to make the build system execute one extra redundant command than expose users to a bug because of a change that snuck in unnoticed. Only the images for currently maintained Fedoras (ie., 34 and 35) were updated. This reverts commit 033ed71ec10fc8647a38ab1c2a1aed34b309ef40. https://github.com/containers/toolbox/pull/931 --- images/fedora/f34/Containerfile | 1 + images/fedora/f35/Containerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/images/fedora/f34/Containerfile b/images/fedora/f34/Containerfile index cd63d57..fc5de5f 100644 --- a/images/fedora/f34/Containerfile +++ b/images/fedora/f34/Containerfile @@ -12,6 +12,7 @@ LABEL com.github.containers.toolbox="true" \ COPY README.md / RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf +RUN dnf -y swap coreutils-single coreutils-full COPY missing-docs / RUN dnf -y reinstall $(