mirror of
https://github.com/containers/podman.git
synced 2025-10-25 10:16:43 +08:00
Added option to share kernel namespaces in libpod and podman
A pause container is added to the pod if the user opts in. The default pause image and command can be overridden. Pause containers are ignored in ps unless the -a option is present. Pod inspect and pod ps show shared namespaces and pause container. A pause container can't be removed with podman rm, and a pod can be removed if it only has a pause container. Signed-off-by: haircommander <pehunt@redhat.com> Closes: #1187 Approved by: mheon
This commit is contained in:
committed by
Atomic Bot
parent
63dd200e7e
commit
d5e690914d
@ -32,7 +32,7 @@ var (
|
||||
CGROUP_MANAGER = "systemd"
|
||||
STORAGE_OPTIONS = "--storage-driver vfs"
|
||||
ARTIFACT_DIR = "/tmp/.artifacts"
|
||||
CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry}
|
||||
CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, pause}
|
||||
RESTORE_IMAGES = []string{ALPINE, BB}
|
||||
ALPINE = "docker.io/library/alpine:latest"
|
||||
BB = "docker.io/library/busybox:latest"
|
||||
@ -41,6 +41,7 @@ var (
|
||||
nginx = "quay.io/baude/alpine_nginx:latest"
|
||||
redis = "docker.io/library/redis:alpine"
|
||||
registry = "docker.io/library/registry:2"
|
||||
pause = "k8s.gcr.io/pause:3.1"
|
||||
defaultWaitTimeout = 90
|
||||
)
|
||||
|
||||
@ -422,6 +423,18 @@ func (p *PodmanTest) RestoreAllArtifacts() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// CreatePod creates a pod with no pause container
|
||||
// it optionally takes a pod name
|
||||
func (p *PodmanTest) CreatePod(name string) (*PodmanSession, int, string) {
|
||||
var podmanArgs = []string{"pod", "create", "--pause=false", "--share", ""}
|
||||
if name != "" {
|
||||
podmanArgs = append(podmanArgs, "--name", name)
|
||||
}
|
||||
session := p.Podman(podmanArgs)
|
||||
session.WaitWithDefaultTimeout()
|
||||
return session, session.ExitCode(), session.OutputToString()
|
||||
}
|
||||
|
||||
//RunTopContainer runs a simple container in the background that
|
||||
// runs top. If the name passed != "", it will have a name
|
||||
func (p *PodmanTest) RunTopContainer(name string) *PodmanSession {
|
||||
|
||||
Reference in New Issue
Block a user