containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2919 from rhatdan/infra_command 

Internal names do not match external names
This commit is contained in:
OpenShift Merge Robot 2019-04-22 15:24:36 -07:00 committed by GitHub
parent a2487aec67 615a9e9f78
commit d652c8656d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/libpod.conf.5.md
View File

@ -65,13 +65,13 @@ libpod to manage containers.
**cni_plugin_dir**="" **cni_plugin_dir**=""
Directories where CNI plugin binaries may be located Directories where CNI plugin binaries may be located
**pause_image** = "" **infra_image** = ""
Pause container image name for pod pause containers. When running a pod, we Infra (pause) container image name for pod infra containers. When running a pod, we
start a `pause` processes in a container to hold open the namespaces associated with the 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. pod. This container and process, basically sleep/pause for the lifetime of the pod.
**pause_command**="" **infra_command**=""
Command to run the pause container Command to run the infra container
**namespace**="" **namespace**=""
Default libpod namespace. If libpod is joined to a namespace, it will see only containers and pods Default libpod namespace. If libpod is joined to a namespace, it will see only containers and pods

8
libpod.conf
View File

@ -71,11 +71,11 @@ cni_default_network = "podman"
# namespace is set, all containers and pods are visible. # namespace is set, all containers and pods are visible.
#namespace = "" #namespace = ""
# Default pause image name for pod pause containers # Default infra (pause) image name for pod infra containers
pause_image = "k8s.gcr.io/pause:3.1" infra_image = "k8s.gcr.io/pause:3.1"
# Default command to run the pause container # Default command to run the infra container
pause_command = "/pause" infra_command = "/pause"
# Determines whether libpod will reserve ports on the host when they are # Determines whether libpod will reserve ports on the host when they are
# forwarded to containers. When enabled, when ports are forwarded to containers, # forwarded to containers. When enabled, when ports are forwarded to containers,

28
libpod/testdata/config.toml vendored
View File

@ -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/"