summaryrefslogtreecommitdiff
path: root/contrib/podmanimage/stable/Dockerfile
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-04-14 10:27:56 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-04-20 16:11:49 -0400
commit532c7343a9af5fbdcc682f7f93c987b1f1e49b41 (patch)
treeb81c830eca0a6d0bebf95aeeb653ee23d3d5abed /contrib/podmanimage/stable/Dockerfile
parente62d08177024ab237d543d6f19c79631defece33 (diff)
downloadpodman-532c7343a9af5fbdcc682f7f93c987b1f1e49b41.tar.gz
podman-532c7343a9af5fbdcc682f7f93c987b1f1e49b41.tar.bz2
podman-532c7343a9af5fbdcc682f7f93c987b1f1e49b41.zip
Add support for containers.conf to podmanimages
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'contrib/podmanimage/stable/Dockerfile')
-rw-r--r--contrib/podmanimage/stable/Dockerfile10
1 files changed, 3 insertions, 7 deletions
diff --git a/contrib/podmanimage/stable/Dockerfile b/contrib/podmanimage/stable/Dockerfile
index c0c07d9d2..7aeb5bbdc 100644
--- a/contrib/podmanimage/stable/Dockerfile
+++ b/contrib/podmanimage/stable/Dockerfile
@@ -11,16 +11,12 @@ FROM fedora:latest
# Don't include container-selinux and remove
# directories used by yum that are just taking
# up space.
-RUN useradd build; yum -y update; yum -y reinstall shadow-utils; yum -y install podman fuse-overlayfs --exclude container-selinux; rm -rf /var/cache /var/log/dnf* /var/log/yum.*
+RUN useradd podman; yum -y update; yum -y reinstall shadow-utils; yum -y install podman fuse-overlayfs --exclude container-selinux; rm -rf /var/cache /var/log/dnf* /var/log/yum.*
# Adjust storage.conf to enable Fuse storage.
RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf
RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; touch /var/lib/shared/overlay-images/images.lock; touch /var/lib/shared/overlay-layers/layers.lock
-# Adjust libpod.conf to write logging to a file
-RUN sed -i 's/# events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf
+ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/
-# Set up environment variables to note that this is
-# not starting with usernamespace and default to
-# isolate the filesystem with chroot.
-ENV _BUILDAH_STARTED_IN_USERNS="" BUILDAH_ISOLATION=chroot
+ENV _CONTAINERS_USERNS_CONFIGURED=""