diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-29 22:40:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 22:40:17 +0100 |
| commit | 97c21ff78fdcbe8452e1032049c7d606dc7ce228 (patch) | |
| tree | bcd5718d7b06dd9737e05378b87add10792bea31 | |
| parent | 2b0b4327c4f0d247ab0ae408014b5e847893da81 (diff) | |
| parent | 2e50514ade604da37987064846b1adec0baecd02 (diff) | |
| download | podman-97c21ff78fdcbe8452e1032049c7d606dc7ce228.tar.gz podman-97c21ff78fdcbe8452e1032049c7d606dc7ce228.tar.bz2 podman-97c21ff78fdcbe8452e1032049c7d606dc7ce228.zip | |
Merge pull request #12439 from rhatdan/Dockerfile
[CI:DOCS] Move the chown to after the ADDs
| -rw-r--r-- | contrib/podmanimage/stable/Dockerfile | 4 | ||||
| -rw-r--r-- | contrib/podmanimage/testing/Dockerfile | 4 | ||||
| -rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/podmanimage/stable/Dockerfile b/contrib/podmanimage/stable/Dockerfile index 7950269d2..b0b5bb33b 100644 --- a/contrib/podmanimage/stable/Dockerfile +++ b/contrib/podmanimage/stable/Dockerfile @@ -19,11 +19,11 @@ RUN useradd podman; \ echo podman:10000:5000 > /etc/subuid; \ echo podman:10000:5000 > /etc/subgid; -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 mkdir -p /home/podman/.local/share/containers; 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 diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile index 03da05806..e7228ea42 100644 --- a/contrib/podmanimage/testing/Dockerfile +++ b/contrib/podmanimage/testing/Dockerfile @@ -19,11 +19,11 @@ RUN useradd podman; \ echo podman:10000:5000 > /etc/subuid; \ echo podman:10000:5000 > /etc/subgid; -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 mkdir -p /home/podman/.local/share/containers; 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 diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile index 89ec6e39b..864227f89 100644 --- a/contrib/podmanimage/upstream/Dockerfile +++ b/contrib/podmanimage/upstream/Dockerfile @@ -68,11 +68,11 @@ RUN useradd podman; \ echo podman:10000:5000 > /etc/subuid; \ echo podman:10000:5000 > /etc/subgid; -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 mkdir -p /home/podman/.local/share/containers; 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 |