summaryrefslogtreecommitdiff
path: root/docs/libpod.conf.5.md
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-09-05 12:14:57 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-09-06 14:48:51 +0000
commit2e6243b18539175b5ff029a924c4d83834f83d2b (patch)
treea034560d697b1ce7e07497da96bce9886887d9bd /docs/libpod.conf.5.md
parent490cc82d0b48f118b32525b568b3ed5e1fc82973 (diff)
downloadpodman-2e6243b18539175b5ff029a924c4d83834f83d2b.tar.gz
podman-2e6243b18539175b5ff029a924c4d83834f83d2b.tar.bz2
podman-2e6243b18539175b5ff029a924c4d83834f83d2b.zip
Fix up libpod.conf man pages and referencese to it.
Remove podman --config option, since it does not do anything. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1410 Approved by: mheon
Diffstat (limited to 'docs/libpod.conf.5.md')
-rw-r--r--docs/libpod.conf.5.md18
1 files changed, 17 insertions, 1 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md
index e544716a3..e881c4296 100644
--- a/docs/libpod.conf.5.md
+++ b/docs/libpod.conf.5.md
@@ -45,8 +45,24 @@ libpod to manage containers.
**cni_plugin_dir**=""
Directories where CNI plugin binaries may be located
+**pause_image** = ""
+ Pause container image name for pod pause containers. When running a pod, we
+ start a `pause` processes in a container to hold open the namespaces associated with the
+ pod. This container and process, basically sleep/pause for the lifetime of the pod.
+
+**pause_command**=""
+ Command to run the pause container
+
+**namespace**=""
+ Default libpod namespace. If libpod is joined to a namespace, it will see only containers and pods
+ that were created in the same namespace, and will create new containers and pods in that namespace.
+ The default namespace is "", which corresponds to no namespace. When no namespace is set, all
+ containers and pods are visible.
+
## FILES
-/etc/containers/libpod.conf, default libpod configuration path
+ `/usr/share/containers/libpod.conf`, default libpod configuration path
+
+ `/etc/containers/libpod.conf`, override libpod configuration path
## HISTORY
Apr 2018, Originally compiled by Nathan Williams <nath.e.will@gmail.com>