From 2c9f18100fc6a2891b5b360b5a25fc00f591201e Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 22 Jul 2021 15:50:18 -0400 Subject: Fix handling of shadow-utils There seems to be a bug in rpm, where it fails silently if you specify rpm --restore --quiet shadow-utils. rpm --restore shadow-utils 2> /dev/null Does the right thing. [NO TESTS NEEDED] Might add tests from buildah, once we have them working correctly. Signed-off-by: Daniel J Walsh --- contrib/podmanimage/stable/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/podmanimage/stable') diff --git a/contrib/podmanimage/stable/Dockerfile b/contrib/podmanimage/stable/Dockerfile index a5d485e7f..f980d15ed 100644 --- a/contrib/podmanimage/stable/Dockerfile +++ b/contrib/podmanimage/stable/Dockerfile @@ -11,7 +11,7 @@ FROM registry.fedoraproject.org/fedora:latest # Don't include container-selinux and remove # directories used by yum that are just taking # up space. -RUN dnf -y update; rpm --restore --quiet shadow-utils; \ +RUN dnf -y update; rpm --restore shadow-utils 2>/dev/null; \ yum -y install podman fuse-overlayfs --exclude container-selinux; \ rm -rf /var/cache /var/log/dnf* /var/log/yum.* -- cgit v1.2.3-54-g00ecf