opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Just restore protections of shadow-utils

Browse Source 
Rather then reinstalling shadow-utils to fix permissions,
just restore the correct permissions.

[NO TESTS NEEDED] Since this does not affect Podman, just the prebuilt
images on quay.io/podman.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2021-07-19 06:39:59 -04:00
parent 20c9f74c77
commit b92bbfd768
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/podmanimage/stable/Dockerfile
View File

@ -11,7 +11,7 @@ FROM registry.fedoraproject.org/fedora:latest
# Don't include container-selinux and remove # Don't include container-selinux and remove
# directories used by yum that are just taking # directories used by yum that are just taking
# up space. # up space.
RUN dnf -y update; yum -y reinstall shadow-utils; \ RUN dnf -y update; rpm --restore --quiet shadow-utils; \
yum -y install podman fuse-overlayfs --exclude container-selinux; \ yum -y install podman fuse-overlayfs --exclude container-selinux; \
rm -rf /var/cache /var/log/dnf* /var/log/yum.* rm -rf /var/cache /var/log/dnf* /var/log/yum.*

2
contrib/podmanimage/testing/Dockerfile
View File

@ -13,7 +13,7 @@ FROM registry.fedoraproject.org/fedora:latest
# Don't include container-selinux and remove # Don't include container-selinux and remove
# directories used by yum that are just taking # directories used by yum that are just taking
# up space. # up space.
RUN yum -y update; yum -y reinstall 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 --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 useradd podman; \ RUN useradd podman; \
echo podman:10000:5000 > /etc/subuid; \ echo podman:10000:5000 > /etc/subuid; \

2
contrib/podmanimage/upstream/Dockerfile
View File

@ -17,7 +17,7 @@ ENV GOPATH=/root/podman
# to the container. # to the container.
# Finally remove the podman directory and a few other packages # Finally remove the podman directory and a few other packages
# that are needed for building but not running Podman # that are needed for building but not running Podman
RUN yum -y update; yum -y reinstall shadow-utils; yum -y install --exclude container-selinux \ RUN yum -y update; rpm --restore --quiet shadow-utils; yum -y install --exclude container-selinux \
--enablerepo=updates-testing \ --enablerepo=updates-testing \
btrfs-progs-devel \ btrfs-progs-devel \
containernetworking-cni \ containernetworking-cni \