summaryrefslogtreecommitdiff
path: root/contrib/podmanimage/upstream
diff options
context:
space:
mode:
authorJindrich Novy <jnovy@redhat.com>2021-10-13 10:49:03 +0200
committerDaniel J Walsh <dwalsh@redhat.com>2021-11-10 17:15:58 -0500
commit980c47aaa296afb027405ec5f30dbefceafb418b (patch)
tree0087e76da1d741687607e65f9df0ca96ca3f7e2e /contrib/podmanimage/upstream
parent4bf0146c2978960b8c4dc5a9844c4948effbcfd2 (diff)
downloadpodman-980c47aaa296afb027405ec5f30dbefceafb418b.tar.gz
podman-980c47aaa296afb027405ec5f30dbefceafb418b.tar.bz2
podman-980c47aaa296afb027405ec5f30dbefceafb418b.zip
VOLUME must be declared after RUN chown command
Podman and Docker will not commit changes via RUN command of a VOLUME directory, so we need to chown path first. Not doing do will cause: https://bugzilla.redhat.com/show_bug.cgi?id=2009266 Signed-off-by: Jindrich Novy <jnovy@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'contrib/podmanimage/upstream')
-rw-r--r--contrib/podmanimage/upstream/Dockerfile9
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile
index 75de947ea..89ec6e39b 100644
--- a/contrib/podmanimage/upstream/Dockerfile
+++ b/contrib/podmanimage/upstream/Dockerfile
@@ -68,14 +68,15 @@ 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
-RUN mkdir -p /home/podman/.local/share/containers
+RUN mkdir -p /home/podman/.local/share/containers; chown podman:podman -R /home/podman
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
+# Note VOLUME options must always happen after the chown call above
+# RUN commands can not modify existing volumes
+VOLUME /var/lib/containers
+VOLUME /home/podman/.local/share/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",' -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' /etc/containers/storage.conf