opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change pause container to infra container

Browse Source 
Signed-off-by: haircommander <pehunt@redhat.com>

Closes: #1187
Approved by: mheon
This commit is contained in:
haircommander
2018-08-17 10:36:51 -04:00
committed by Atomic Bot
parent 697b46430a
commit 2a7449362f
25 changed files with 251 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libpod/runtime.go
View File

@ -57,10 +57,10 @@ const (
// place of the configuration file pointed to by ConfigPath.
OverrideConfigPath = "/etc/containers/libpod.conf"
// DefaultPauseImage to use for pause container
DefaultPauseImage = "k8s.gcr.io/pause:3.1"
// DefaultPauseCommand to be run in a pause container
DefaultPauseCommand = "/pause"
// DefaultInfraImage to use for infra container
DefaultInfraImage = "k8s.gcr.io/pause:3.1"
// DefaultInfraCommand to be run in an infra container
DefaultInfraCommand = "/pause"
)
// A RuntimeOption is a functional option which alters the Runtime created by
@ -157,10 +157,10 @@ type RuntimeConfig struct {
// and all containers and pods will be visible.
// The default namespace is "".
Namespace string `toml:"namespace,omitempty"`
// PauseImage is the image a pod pause container will use to manage namespaces
PauseImage string `toml:"pause_image"`
// PauseCommand is the command run to start up a pod pause container
PauseCommand string `toml:"pause_command"`
// InfraImage is the image a pod infra container will use to manage namespaces
InfraImage string `toml:"infra_image"`
// InfraCommand is the command run to start up a pod infra container
InfraCommand string `toml:"infra_command"`
}
var (
@ -195,8 +195,8 @@ var (
NoPivotRoot: false,
CNIConfigDir: "/etc/cni/net.d/",
CNIPluginDir: []string{"/usr/libexec/cni", "/usr/lib/cni", "/opt/cni/bin"},
PauseCommand: DefaultPauseCommand,
PauseImage: DefaultPauseImage,
InfraCommand: DefaultInfraCommand,
InfraImage: DefaultInfraImage,
}
)