containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11025 from rhatdan/dockerfile 

[CI:DOCS] Fix handling of shadow-utils
This commit is contained in:
OpenShift Merge Robot 2021-07-27 13:58:22 +02:00 committed by GitHub
parent d7b2f03f8a 2c9f18100f
commit 684f15edee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats 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; 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; \ 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; 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; \ 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; 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 \ --enablerepo=updates-testing \
btrfs-progs-devel \ btrfs-progs-devel \
containernetworking-cni \ containernetworking-cni \