container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-19 16:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14519 from rhatdan/Dockerfile

Browse source 
[CI:DOCS] Podman images generated with empty /etc/containers/storage.conf
This commit is contained in:
OpenShift Merge Robot 2022-06-07 16:00:46 -04:00 committed by GitHub
parent 496677925a 126686f3d7
commit dfdc95754e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/podmanimage/stable/Containerfile
View file

@ -32,7 +32,7 @@ RUN mkdir -p /home/podman/.local/share/containers && \
# Copy & modify the defaults to provide reference if runtime changes needed. # Copy & modify the defaults to provide reference if runtime changes needed.
# Changes here are required for running with fuse-overlay storage inside container. # 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 '/additionalimage.*/a "/var/lib/shared",' \
-e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \ -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \
/usr/share/containers/storage.conf \ /usr/share/containers/storage.conf \

2
contrib/podmanimage/testing/Containerfile
View file

@ -31,7 +31,7 @@ RUN mkdir -p /home/podman/.local/share/containers && \
# Copy & modify the defaults to provide reference if runtime changes needed. # Copy & modify the defaults to provide reference if runtime changes needed.
# Changes here are required for running with fuse-overlay storage inside container. # 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 '/additionalimage.*/a "/var/lib/shared",' \
-e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \ -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \
/usr/share/containers/storage.conf \ /usr/share/containers/storage.conf \

2
contrib/podmanimage/upstream/Containerfile
View file

@ -38,7 +38,7 @@ RUN mkdir -p /home/podman/.local/share/containers && \
# Copy & modify the defaults to provide reference if runtime changes needed. # Copy & modify the defaults to provide reference if runtime changes needed.
# Changes here are required for running with fuse-overlay storage inside container. # 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 '/additionalimage.*/a "/var/lib/shared",' \
-e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \ -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \
/usr/share/containers/storage.conf \ /usr/share/containers/storage.conf \