diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libpod.conf.5.md | 10 | ||||
| -rw-r--r-- | docs/podman-pull.1.md | 2 |
2 files changed, 7 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 diff --git a/docs/podman-pull.1.md b/docs/podman-pull.1.md index 92740c3af..ab01bb40d 100644 --- a/docs/podman-pull.1.md +++ b/docs/podman-pull.1.md @@ -49,6 +49,8 @@ Image stored in local container/storage All tagged images in the repository will be pulled. +Note: When using the all-tags flag, Podman will not iterate over the search registries in the containers-registries.conf(5) but will always use docker.io for unqualified image names. + **--authfile** Path of the authentication file. Default is ${XDG_RUNTIME\_DIR}/containers/auth.json, which is set using `podman login`. |