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 033ed71ec1.

https://github.com/containers/toolbox/pull/931
This commit is contained in:
Debarshi Ray 2021-11-19 02:29:30 +01:00
parent 7542f5fc86
commit 5dbcd377c6
2 changed files with 2 additions and 0 deletions

View File

@ -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 $(<missing-docs)

View File

@ -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 $(<missing-docs)