aboutsummaryrefslogtreecommitdiff
path: root/contrib/podmanimage/testing
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-12 16:43:22 +0200
committerGitHub <noreply@github.com>2021-04-12 16:43:22 +0200
commit3803a2630f2bc53f18cbf2b7a825ff1b068a0fb7 (patch)
treebb45e4260ec4e295ec2f36dc87a87e82ce336e59 /contrib/podmanimage/testing
parentbd3dcb9ec4d4b2d722e25a9d001c63474e54dd53 (diff)
parentadbddac60fd9204b451019f37ea33840e857ec28 (diff)
downloadpodman-3803a2630f2bc53f18cbf2b7a825ff1b068a0fb7.tar.gz
podman-3803a2630f2bc53f18cbf2b7a825ff1b068a0fb7.tar.bz2
podman-3803a2630f2bc53f18cbf2b7a825ff1b068a0fb7.zip
Merge pull request #9956 from rhatdan/pinp
[CI:DOCS] Update podman image Dockerfile to support Podman in container
Diffstat (limited to 'contrib/podmanimage/testing')
-rw-r--r--contrib/podmanimage/testing/Dockerfile14
1 files changed, 12 insertions, 2 deletions
diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile
index 97690360d..c20b26ac4 100644
--- a/contrib/podmanimage/testing/Dockerfile
+++ b/contrib/podmanimage/testing/Dockerfile
@@ -13,9 +13,19 @@ FROM registry.fedoraproject.org/fedora:latest
# Don't include container-selinux and remove
# directories used by yum that are just taking
# up space.
-RUN useradd podman; 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; 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.*
-ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/
+RUN useradd podman; \
+echo podman:10000:5000 > /etc/subuid; \
+echo podman:10000:5000 > /etc/subgid;
+
+VOLUME /var/lib/containers
+VOLUME /home/podman/.local/share/containers
+
+ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf
+ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/podman-containers.conf /home/podman/.config/containers/containers.conf
+
+RUN chown podman:podman -R /home/podman
# chmod containers.conf and adjust storage.conf to enable Fuse storage.
RUN chmod 644 /etc/containers/containers.conf; sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' /etc/containers/storage.conf