summaryrefslogtreecommitdiff
path: root/libpod.conf
diff options
context:
space:
mode:
authorhaircommander <pehunt@redhat.com>2018-07-27 13:58:50 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-23 18:16:28 +0000
commitd5e690914dc78eca8664442e7677eb5004522bfd (patch)
tree3f7ed30e4302c871c16126a0032b8a3d51c46f98 /libpod.conf
parent63dd200e7e47261454c7e55fed2ad972144e147f (diff)
downloadpodman-d5e690914dc78eca8664442e7677eb5004522bfd.tar.gz
podman-d5e690914dc78eca8664442e7677eb5004522bfd.tar.bz2
podman-d5e690914dc78eca8664442e7677eb5004522bfd.zip
Added option to share kernel namespaces in libpod and podman
A pause container is added to the pod if the user opts in. The default pause image and command can be overridden. Pause containers are ignored in ps unless the -a option is present. Pod inspect and pod ps show shared namespaces and pause container. A pause container can't be removed with podman rm, and a pod can be removed if it only has a pause container. Signed-off-by: haircommander <pehunt@redhat.com> Closes: #1187 Approved by: mheon
Diffstat (limited to 'libpod.conf')
-rw-r--r--libpod.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod.conf b/libpod.conf
index cef5a12d8..9de42caf2 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -65,3 +65,9 @@ cni_plugin_dir = [
# The default namespace is "", which corresponds to no namespace. When no
# namespace is set, all containers and pods are visible.
#namespace = ""
+
+# Default pause image name for pod pause containers
+pause_image = "k8s.gcr.io/pause:3.1"
+
+# Default command to run the pause container
+pause_command = "/pause"