diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2018-10-01 10:29:45 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-10-01 10:31:17 -0700 |
| commit | a2ad8fef136b31989bfcd2f40003f6113aebaf1d (patch) | |
| tree | 687966350701e0dc96440699cd32c79266e6bb75 /runsc/container | |
| parent | 43e6aff50e23763d12c71b054f100fd91da46736 (diff) | |
Make multi-container the default mode for runsc
And remove multicontainer option.
PiperOrigin-RevId: 215236981
Change-Id: I9fd1d963d987e421e63d5817f91a25c819ced6cb
Diffstat (limited to 'runsc/container')
| -rw-r--r-- | runsc/container/container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runsc/container/container.go b/runsc/container/container.go index b39d6bf12..be833c03d 100644 --- a/runsc/container/container.go +++ b/runsc/container/container.go @@ -267,7 +267,7 @@ func Create(id string, spec *specs.Spec, conf *boot.Config, bundleDir, consoleSo // started in an existing sandbox, we must do so. The metadata will // indicate the ID of the sandbox, which is the same as the ID of the // init container in the sandbox. - if specutils.ShouldCreateSandbox(spec) || !conf.MultiContainer { + if specutils.ShouldCreateSandbox(spec) { log.Debugf("Creating new sandbox for container %q", id) ioFiles, err := c.createGoferProcess(spec, conf, bundleDir) if err != nil { @@ -345,7 +345,7 @@ func (c *Container) Start(conf *boot.Config) error { } } - if specutils.ShouldCreateSandbox(c.Spec) || !conf.MultiContainer { + if specutils.ShouldCreateSandbox(c.Spec) { if err := c.Sandbox.StartRoot(c.Spec, conf); err != nil { return err } |