mirror of
https://github.com/containers/podman
synced 2024-10-22 10:13:33 +00:00
Merge pull request #11025 from rhatdan/dockerfile
[CI:DOCS] Fix handling of shadow-utils
This commit is contained in:
commit
684f15edee
|
@ -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.*
|
||||
|
||||
|
|
|
@ -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; \
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue