diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-14 10:27:56 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-20 16:11:49 -0400 |
| commit | 532c7343a9af5fbdcc682f7f93c987b1f1e49b41 (patch) | |
| tree | b81c830eca0a6d0bebf95aeeb653ee23d3d5abed /contrib/podmanimage/stable/manual | |
| parent | e62d08177024ab237d543d6f19c79631defece33 (diff) | |
| download | podman-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/manual')
| -rw-r--r-- | contrib/podmanimage/stable/manual/Containerfile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/podmanimage/stable/manual/Containerfile b/contrib/podmanimage/stable/manual/Containerfile index d76d6d9b4..afc4f5ffd 100644 --- a/contrib/podmanimage/stable/manual/Containerfile +++ b/contrib/podmanimage/stable/manual/Containerfile @@ -30,10 +30,6 @@ RUN yum -y install /tmp/podman-1.7.0-3.fc30.x86_64.rpm fuse-overlayfs --exclude 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; mkdir -p /run/systemd/journal +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="" |