diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-17 06:01:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 06:01:59 -0500 |
| commit | c018c0f3c7194f2cc8c6ca4082585a71d243f979 (patch) | |
| tree | b63517b1622daf64a43f018f6d0bf69b30a207bb | |
| parent | deb75f56543cf1f596082250dd82e4b0ec746e88 (diff) | |
| parent | 13f6261f84834f03676482535430f7357c750ed5 (diff) | |
| download | podman-c018c0f3c7194f2cc8c6ca4082585a71d243f979.tar.gz podman-c018c0f3c7194f2cc8c6ca4082585a71d243f979.tar.bz2 podman-c018c0f3c7194f2cc8c6ca4082585a71d243f979.zip | |
Merge pull request #13252 from chmouel/increase-subuid-subgid
increase subuid and subgid in image
| -rw-r--r-- | contrib/podmanimage/stable/Dockerfile | 4 | ||||
| -rw-r--r-- | contrib/podmanimage/testing/Dockerfile | 4 | ||||
| -rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/podmanimage/stable/Dockerfile b/contrib/podmanimage/stable/Dockerfile index a81c6fd58..78d820458 100644 --- a/contrib/podmanimage/stable/Dockerfile +++ b/contrib/podmanimage/stable/Dockerfile @@ -16,8 +16,8 @@ yum -y install podman fuse-overlayfs --exclude container-selinux; \ rm -rf /var/cache /var/log/dnf* /var/log/yum.* RUN useradd podman; \ -echo podman:10000:5000 > /etc/subuid; \ -echo podman:10000:5000 > /etc/subgid; +echo -e "podman:1:999\npodman:1001:64535" > /etc/subuid; \ +echo -e "podman:1:999\npodman:1001:64535" > /etc/subgid; ADD https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf ADD https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile index 0b3e077a6..41af1c849 100644 --- a/contrib/podmanimage/testing/Dockerfile +++ b/contrib/podmanimage/testing/Dockerfile @@ -16,8 +16,8 @@ FROM registry.fedoraproject.org/fedora:latest 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; \ -echo podman:10000:5000 > /etc/subgid; +echo -e "podman:1:999\npodman:1001:64535" > /etc/subuid; \ +echo -e "podman:1:999\npodman:1001:64535" > /etc/subgid; ADD https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf ADD https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile index 4b44c74c2..0769a7612 100644 --- a/contrib/podmanimage/upstream/Dockerfile +++ b/contrib/podmanimage/upstream/Dockerfile @@ -65,8 +65,8 @@ RUN yum -y update; rpm --restore shadow-utils 2>/dev/null; yum -y install --exc yum clean all; RUN useradd podman; \ -echo podman:10000:5000 > /etc/subuid; \ -echo podman:10000:5000 > /etc/subgid; +echo -e "podman:1:999\npodman:1001:64535" > /etc/subuid; \ +echo -e "podman:1:999\npodman:1001:64535" > /etc/subgid; ADD https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf ADD https://raw.githubusercontent.com/containers/podman/main/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf |