summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlake Burkhart <blake.burkhart@us.af.mil>2021-06-14 14:13:51 -0500
committerBlake Burkhart <blake.burkhart@us.af.mil>2021-06-14 14:40:36 -0500
commit2a974e8b946920256bf21cae74380b4f06c048d3 (patch)
tree6dfccc0a7da7a952bd5c92b5b278b635278c2922
parente2f51eeb0693eda026fa509a9decfbdd7e0b74a8 (diff)
downloadpodman-2a974e8b946920256bf21cae74380b4f06c048d3.tar.gz
podman-2a974e8b946920256bf21cae74380b4f06c048d3.tar.bz2
podman-2a974e8b946920256bf21cae74380b4f06c048d3.zip
Create user storage dir with correct permissions
Docker VOLUMEs will inherit permissions from an existing directory at the same path. If the path does not exist, the directory will be owned by root which makes this image unusable in rootless mode. Signed-off-by: Blake Burkhart <blake.burkhart@us.af.mil>
-rw-r--r--contrib/podmanimage/stable/Dockerfile1
-rw-r--r--contrib/podmanimage/testing/Dockerfile1
-rw-r--r--contrib/podmanimage/upstream/Dockerfile1
3 files changed, 3 insertions, 0 deletions
diff --git a/contrib/podmanimage/stable/Dockerfile b/contrib/podmanimage/stable/Dockerfile
index 696268c85..2f86dd4ae 100644
--- a/contrib/podmanimage/stable/Dockerfile
+++ b/contrib/podmanimage/stable/Dockerfile
@@ -21,6 +21,7 @@ echo podman:10000:5000 > /etc/subgid;
VOLUME /var/lib/containers
VOLUME /home/podman/.local/share/containers
+RUN mkdir -p /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
diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile
index c20b26ac4..63b31252f 100644
--- a/contrib/podmanimage/testing/Dockerfile
+++ b/contrib/podmanimage/testing/Dockerfile
@@ -21,6 +21,7 @@ echo podman:10000:5000 > /etc/subgid;
VOLUME /var/lib/containers
VOLUME /home/podman/.local/share/containers
+RUN mkdir -p /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
diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile
index 1277f9ba8..922eee748 100644
--- a/contrib/podmanimage/upstream/Dockerfile
+++ b/contrib/podmanimage/upstream/Dockerfile
@@ -69,6 +69,7 @@ echo podman:10000:5000 > /etc/subgid;
VOLUME /var/lib/containers
VOLUME /home/podman/.local/share/containers
+RUN mkdir -p /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