diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-22 15:24:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 15:24:36 -0700 |
| commit | d652c8656d7425c34234071eddb55cbba9ac070f (patch) | |
| tree | 4c73d58159e530c7fb0202dbc06e4ed4473e172e /docs/libpod.conf.5.md | |
| parent | a2487aec6703b0b37a1b53e0b53534e3517d2124 (diff) | |
| parent | 615a9e9f78eee0038b8803eb1223541fe28c6e16 (diff) | |
| download | podman-d652c8656d7425c34234071eddb55cbba9ac070f.tar.gz podman-d652c8656d7425c34234071eddb55cbba9ac070f.tar.bz2 podman-d652c8656d7425c34234071eddb55cbba9ac070f.zip | |
Merge pull request #2919 from rhatdan/infra_command
Internal names do not match external names
Diffstat (limited to 'docs/libpod.conf.5.md')
| -rw-r--r-- | docs/libpod.conf.5.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md index 777edeacb..4abbcd8b0 100644 --- a/docs/libpod.conf.5.md +++ b/docs/libpod.conf.5.md @@ -65,13 +65,13 @@ 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 +**infra_image** = "" + Infra (pause) container image name for pod infra containers. When running a pod, we + start a `pause` process 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 +**infra_command**="" + Command to run the infra container **namespace**="" Default libpod namespace. If libpod is joined to a namespace, it will see only containers and pods |