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/upstream/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/podmanimage/upstream/Dockerfile') diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile index 01666e453..baad49e08 100644 --- a/contrib/podmanimage/upstream/Dockerfile +++ b/contrib/podmanimage/upstream/Dockerfile @@ -17,7 +17,7 @@ ENV GOPATH=/root/podman # to the container. # Finally remove the podman directory and a few other packages # that are needed for building but not running Podman -RUN yum -y update; rpm --restore --quiet shadow-utils; yum -y install --exclude container-selinux \ +RUN yum -y update; rpm --restore shadow-utils 2>/dev/null; yum -y install --exclude container-selinux \ --enablerepo=updates-testing \ btrfs-progs-devel \ containernetworking-cni \ -- cgit v1.2.3-54-g00ecf