summaryrefslogtreecommitdiff
path: root/contrib/podmanimage/testing/Dockerfile
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2020-04-27 17:24:09 -0400
committerTomSweeneyRedHat <tsweeney@redhat.com>2020-04-28 17:52:14 -0400
commit9229312f2aa77eb30ed8a295d3a0449bcb369cc4 (patch)
treed0a308eed0255e606d1d8a5c14348cfd30890d08 /contrib/podmanimage/testing/Dockerfile
parentbf4efc1953467907ae7d75d5f3ef3cd41505ee24 (diff)
downloadpodman-9229312f2aa77eb30ed8a295d3a0449bcb369cc4.tar.gz
podman-9229312f2aa77eb30ed8a295d3a0449bcb369cc4.tar.bz2
podman-9229312f2aa77eb30ed8a295d3a0449bcb369cc4.zip
Update podmanimage files to adjust perms on containers.conf for rootless
Adding the changes to the Podman image Docker/Containerfiles similar to @rhatdan 's changes in https://github.com/containers/buildah/pull/2332 In short it changes the perms on containers.conf so it can be used by a rootless user. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Diffstat (limited to 'contrib/podmanimage/testing/Dockerfile')
-rw-r--r--contrib/podmanimage/testing/Dockerfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile
index 3a7a0b7f8..31265a0ea 100644
--- a/contrib/podmanimage/testing/Dockerfile
+++ b/contrib/podmanimage/testing/Dockerfile
@@ -15,10 +15,10 @@ FROM fedora:latest
# 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.*
-# Adjust storage.conf to enable Fuse storage.
-RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf
-RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; touch /var/lib/shared/overlay-images/images.lock; touch /var/lib/shared/overlay-layers/layers.lock
-
ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/
+# 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",' /etc/containers/storage.conf
+RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; touch /var/lib/shared/overlay-images/images.lock; touch /var/lib/shared/overlay-layers/layers.lock
+
ENV _CONTAINERS_USERNS_CONFIGURED=""