diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-04-27 17:24:09 -0400 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-04-28 17:52:14 -0400 |
| commit | 9229312f2aa77eb30ed8a295d3a0449bcb369cc4 (patch) | |
| tree | d0a308eed0255e606d1d8a5c14348cfd30890d08 /contrib/podmanimage/upstream | |
| parent | bf4efc1953467907ae7d75d5f3ef3cd41505ee24 (diff) | |
| download | podman-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/upstream')
| -rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile index 3b2f49094..541670aa2 100644 --- a/contrib/podmanimage/upstream/Dockerfile +++ b/contrib/podmanimage/upstream/Dockerfile @@ -63,10 +63,10 @@ RUN useradd podman; yum -y update; yum -y reinstall shadow-utils; yum -y install yum -y remove git golang go-md2man make; \ yum clean all; -# 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="" |