diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-07 16:00:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 16:00:46 -0400 |
| commit | dfdc95754e2ac8079787355b82b4e02a48cd83e4 (patch) | |
| tree | 50d02cd88ed5e69fbbcfb64fa0c5b4f2ef7d59d3 | |
| parent | 496677925a3efa0a1e968224419a4449a21006ce (diff) | |
| parent | 126686f3d780e0b4e6fbdc4ca41547a304198c09 (diff) | |
| download | podman-dfdc95754e2ac8079787355b82b4e02a48cd83e4.tar.gz podman-dfdc95754e2ac8079787355b82b4e02a48cd83e4.tar.bz2 podman-dfdc95754e2ac8079787355b82b4e02a48cd83e4.zip | |
Merge pull request #14519 from rhatdan/Dockerfile
[CI:DOCS] Podman images generated with empty /etc/containers/storage.conf
| -rw-r--r-- | contrib/podmanimage/stable/Containerfile | 2 | ||||
| -rw-r--r-- | contrib/podmanimage/testing/Containerfile | 2 | ||||
| -rw-r--r-- | contrib/podmanimage/upstream/Containerfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/podmanimage/stable/Containerfile b/contrib/podmanimage/stable/Containerfile index f4ab0cc79..9121c5cde 100644 --- a/contrib/podmanimage/stable/Containerfile +++ b/contrib/podmanimage/stable/Containerfile @@ -32,7 +32,7 @@ RUN mkdir -p /home/podman/.local/share/containers && \ # Copy & modify the defaults to provide reference if runtime changes needed. # Changes here are required for running with fuse-overlay storage inside container. -RUN sed -i -e 's|^#mount_program|mount_program|g' \ +RUN sed -e 's|^#mount_program|mount_program|g' \ -e '/additionalimage.*/a "/var/lib/shared",' \ -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \ /usr/share/containers/storage.conf \ diff --git a/contrib/podmanimage/testing/Containerfile b/contrib/podmanimage/testing/Containerfile index 0f2dd891f..16314a633 100644 --- a/contrib/podmanimage/testing/Containerfile +++ b/contrib/podmanimage/testing/Containerfile @@ -31,7 +31,7 @@ RUN mkdir -p /home/podman/.local/share/containers && \ # Copy & modify the defaults to provide reference if runtime changes needed. # Changes here are required for running with fuse-overlay storage inside container. -RUN sed -i -e 's|^#mount_program|mount_program|g' \ +RUN sed -e 's|^#mount_program|mount_program|g' \ -e '/additionalimage.*/a "/var/lib/shared",' \ -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \ /usr/share/containers/storage.conf \ diff --git a/contrib/podmanimage/upstream/Containerfile b/contrib/podmanimage/upstream/Containerfile index 256c31232..c3a07a8d6 100644 --- a/contrib/podmanimage/upstream/Containerfile +++ b/contrib/podmanimage/upstream/Containerfile @@ -38,7 +38,7 @@ RUN mkdir -p /home/podman/.local/share/containers && \ # Copy & modify the defaults to provide reference if runtime changes needed. # Changes here are required for running with fuse-overlay storage inside container. -RUN sed -i -e 's|^#mount_program|mount_program|g' \ +RUN sed -e 's|^#mount_program|mount_program|g' \ -e '/additionalimage.*/a "/var/lib/shared",' \ -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \ /usr/share/containers/storage.conf \ |