diff options
author | haircommander <pehunt@redhat.com> | 2018-08-17 10:36:51 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-23 18:16:28 +0000 |
commit | 2a7449362f2884d9ae6a783c0ce38979d882e2cf (patch) | |
tree | 6e7b8ab33505d210201e62faba6a50f98c0a4ea7 /libpod/runtime_pod_pause_linux.go | |
parent | 697b46430a8a7c2c7231078911dcec51f0c6fab5 (diff) | |
download | podman-2a7449362f2884d9ae6a783c0ce38979d882e2cf.tar.gz podman-2a7449362f2884d9ae6a783c0ce38979d882e2cf.tar.bz2 podman-2a7449362f2884d9ae6a783c0ce38979d882e2cf.zip |
Change pause container to infra container
Signed-off-by: haircommander <pehunt@redhat.com>
Closes: #1187
Approved by: mheon
Diffstat (limited to 'libpod/runtime_pod_pause_linux.go')
-rw-r--r-- | libpod/runtime_pod_pause_linux.go | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/libpod/runtime_pod_pause_linux.go b/libpod/runtime_pod_pause_linux.go deleted file mode 100644 index 41bf8b041..000000000 --- a/libpod/runtime_pod_pause_linux.go +++ /dev/null @@ -1,60 +0,0 @@ -// +build linux - -package libpod - -import ( - "context" - - "github.com/containers/libpod/libpod/image" - "github.com/opencontainers/runtime-tools/generate" -) - -const ( - // IDTruncLength is the length of the pod's id that will be used to make the - // pause container name - IDTruncLength = 12 -) - -func (r *Runtime) makePauseContainer(ctx context.Context, p *Pod, imgName, imgID string) (*Container, error) { - - // Set up generator for pause container defaults - g, err := generate.New("linux") - if err != nil { - return nil, err - } - - g.SetRootReadonly(true) - g.SetProcessArgs([]string{r.config.PauseCommand}) - - containerName := p.ID()[:IDTruncLength] + "-infra" - var options []CtrCreateOption - options = append(options, r.WithPod(p)) - options = append(options, WithRootFSFromImage(imgID, imgName, false)) - options = append(options, WithName(containerName)) - options = append(options, withIsPause()) - - return r.newContainer(ctx, g.Config, options...) -} - -// createPauseContainer wrap creates a pause container for a pod. -// A pause container becomes the basis for kernel namespace sharing between -// containers in the pod. -func (r *Runtime) createPauseContainer(ctx context.Context, p *Pod) (*Container, error) { - if !r.valid { - return nil, ErrRuntimeStopped - } - - newImage, err := r.ImageRuntime().New(ctx, r.config.PauseImage, "", "", nil, nil, image.SigningOptions{}, false, false) - if err != nil { - return nil, err - } - - data, err := newImage.Inspect(ctx) - if err != nil { - return nil, err - } - imageName := newImage.Names()[0] - imageID := data.ID - - return r.makePauseContainer(ctx, p, imageName, imageID) -} |