mirror of
https://github.com/containers/podman
synced 2024-10-19 16:54:07 +00:00
Internal names do not match external names
We refer to the pause_image and pause_container in the libpod.conf description, but internally we had infra_image and infra_container. This means it the user made changes to the conf, it would not effect the actual tool using libpod. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
parent
4d45f5180f
commit
615a9e9f78
|
@ -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
|
||||
|
|
|
@ -71,11 +71,11 @@ cni_default_network = "podman"
|
|||
# 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 infra (pause) image name for pod infra containers
|
||||
infra_image = "k8s.gcr.io/pause:3.1"
|
||||
|
||||
# Default command to run the pause container
|
||||
pause_command = "/pause"
|
||||
# Default command to run the infra container
|
||||
infra_command = "/pause"
|
||||
|
||||
# Determines whether libpod will reserve ports on the host when they are
|
||||
# forwarded to containers. When enabled, when ports are forwarded to containers,
|
||||
|
|
28
libpod/testdata/config.toml
vendored
28
libpod/testdata/config.toml
vendored
|
@ -1,28 +0,0 @@
|
|||
[crio]
|
||||
root = "/var/lib/containers/storage"
|
||||
runroot = "/var/run/containers/storage"
|
||||
storage_driver = "overlay2"
|
||||
log_dir = "/var/log/crio/pods"
|
||||
file_locking = true
|
||||
[crio.runtime]
|
||||
runtime = "/usr/bin/runc"
|
||||
runtime_untrusted_workload = ""
|
||||
default_workload_trust = "trusted"
|
||||
conmon = "/usr/local/libexec/crio/conmon"
|
||||
conmon_env = ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"]
|
||||
selinux = true
|
||||
seccomp_profile = "/etc/crio/seccomp.json"
|
||||
apparmor_profile = "crio-default"
|
||||
cgroup_manager = "cgroupfs"
|
||||
hooks_dir = ["/usr/share/containers/oci/hooks.d"]
|
||||
pids_limit = 2048
|
||||
container_exits_dir = "/var/run/podman/exits"
|
||||
[crio.image]
|
||||
default_transport = "docker://"
|
||||
pause_image = "kubernetes/pause"
|
||||
pause_command = "/pause"
|
||||
signature_policy = ""
|
||||
image_volumes = "mkdir"
|
||||
[crio.network]
|
||||
network_dir = "/etc/cni/net.d/"
|
||||
plugin_dir = "/opt/cni/bin/"
|
Loading…
Reference in a new issue