summaryrefslogtreecommitdiff
path: root/contrib/podmanimage
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-06-07 14:39:57 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2022-06-07 14:43:01 -0400
commit126686f3d780e0b4e6fbdc4ca41547a304198c09 (patch)
tree42701ca9dc14629d3a949d000b9d6ac57988dfa3 /contrib/podmanimage
parent96578a26c343aac0f7dfbbf16d9da509cded9ff3 (diff)
downloadpodman-126686f3d780e0b4e6fbdc4ca41547a304198c09.tar.gz
podman-126686f3d780e0b4e6fbdc4ca41547a304198c09.tar.bz2
podman-126686f3d780e0b4e6fbdc4ca41547a304198c09.zip
Podman images generated with empty /etc/containers/storage.conf
The Containerfiles were built with sed -i, which is leading to empty storage.conf files. This will cause Podman in a container to print warning information about storage.driver not being set to something. [NO NEW TESTS REQUIRED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'contrib/podmanimage')
-rw-r--r--contrib/podmanimage/stable/Containerfile2
-rw-r--r--contrib/podmanimage/testing/Containerfile2
-rw-r--r--contrib/podmanimage/upstream/Containerfile2
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 \