diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-07-22 15:50:18 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-07-24 05:45:10 -0400 |
| commit | 2c9f18100fc6a2891b5b360b5a25fc00f591201e (patch) | |
| tree | 5bc60b7f4259cfee801223b81c02c45c9a6ef980 /contrib | |
| parent | 2f79497aba90229664c35fb738704d61e4528f44 (diff) | |
| download | podman-2c9f18100fc6a2891b5b360b5a25fc00f591201e.tar.gz podman-2c9f18100fc6a2891b5b360b5a25fc00f591201e.tar.bz2 podman-2c9f18100fc6a2891b5b360b5a25fc00f591201e.zip | |
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 <dwalsh@redhat.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/podmanimage/stable/Dockerfile | 2 | ||||
| -rw-r--r-- | contrib/podmanimage/testing/Dockerfile | 2 | ||||
| -rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 2 |
3 files changed, 3 insertions, 3 deletions
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.* diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile index 1090fed00..58b11a20b 100644 --- a/contrib/podmanimage/testing/Dockerfile +++ b/contrib/podmanimage/testing/Dockerfile @@ -13,7 +13,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 yum -y update; rpm --restore --quiet shadow-utils; yum -y install podman fuse-overlayfs --exclude container-selinux --enablerepo updates-testing; rm -rf /var/cache /var/log/dnf* /var/log/yum.* +RUN yum -y update; rpm --restore shadow-utils 2>/dev/null; yum -y install podman fuse-overlayfs --exclude container-selinux --enablerepo updates-testing; rm -rf /var/cache /var/log/dnf* /var/log/yum.* RUN useradd podman; \ echo podman:10000:5000 > /etc/subuid; \ 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 \ |