-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request moby#41182 from cpuguy83/runtime_configure_shim
- Loading branch information
Showing
18 changed files
with
238 additions
and
178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| // +build !windows | ||
|
|
||
| package daemon | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/containerd/containerd/runtime/linux/runctypes" | ||
| v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" | ||
| "github.com/docker/docker/api/types" | ||
| "github.com/docker/docker/daemon/config" | ||
| "github.com/docker/docker/pkg/ioutils" | ||
| "github.com/opencontainers/runc/libcontainer/cgroups" | ||
| "github.com/pkg/errors" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| const ( | ||
| defaultRuntimeName = "runc" | ||
|
|
||
| linuxShimV1 = "io.containerd.runtime.v1.linux" | ||
| linuxShimV2 = "io.containerd.runc.v2" | ||
| ) | ||
|
|
||
| func configureRuntimes(conf *config.Config) { | ||
| if conf.DefaultRuntime == "" { | ||
| conf.DefaultRuntime = config.StockRuntimeName | ||
| } | ||
| if conf.Runtimes == nil { | ||
| conf.Runtimes = make(map[string]types.Runtime) | ||
| } | ||
| conf.Runtimes[config.StockRuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: getShimConfig(conf, defaultRuntimeName)} | ||
| conf.Runtimes[config.LinuxV1RuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: defaultV1ShimConfig(conf, defaultRuntimeName)} | ||
| conf.Runtimes[config.LinuxV2RuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: defaultV2ShimConfig(conf, defaultRuntimeName)} | ||
| } | ||
|
|
||
| func getShimConfig(conf *config.Config, runtimePath string) *types.ShimConfig { | ||
| if cgroups.IsCgroup2UnifiedMode() { | ||
| return defaultV2ShimConfig(conf, runtimePath) | ||
| } | ||
| return defaultV1ShimConfig(conf, runtimePath) | ||
| } | ||
|
|
||
| func defaultV2ShimConfig(conf *config.Config, runtimePath string) *types.ShimConfig { | ||
| return &types.ShimConfig{ | ||
| Binary: linuxShimV2, | ||
| Opts: &v2runcoptions.Options{ | ||
| BinaryName: runtimePath, | ||
| Root: filepath.Join(conf.ExecRoot, "runtime-"+defaultRuntimeName), | ||
| SystemdCgroup: UsingSystemd(conf), | ||
| NoPivotRoot: os.Getenv("DOCKER_RAMDISK") != "", | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func defaultV1ShimConfig(conf *config.Config, runtimePath string) *types.ShimConfig { | ||
| return &types.ShimConfig{ | ||
| Binary: linuxShimV1, | ||
| Opts: &runctypes.RuncOptions{ | ||
| Runtime: runtimePath, | ||
| RuntimeRoot: filepath.Join(conf.ExecRoot, "runtime-"+defaultRuntimeName), | ||
| SystemdCgroup: UsingSystemd(conf), | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func (daemon *Daemon) loadRuntimes() error { | ||
| return daemon.initRuntimes(daemon.configStore.Runtimes) | ||
| } | ||
|
|
||
| func (daemon *Daemon) initRuntimes(runtimes map[string]types.Runtime) (err error) { | ||
| runtimeDir := filepath.Join(daemon.configStore.Root, "runtimes") | ||
| // Remove old temp directory if any | ||
| os.RemoveAll(runtimeDir + "-old") | ||
| tmpDir, err := ioutils.TempDir(daemon.configStore.Root, "gen-runtimes") | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to get temp dir to generate runtime scripts") | ||
| } | ||
| defer func() { | ||
| if err != nil { | ||
| if err1 := os.RemoveAll(tmpDir); err1 != nil { | ||
| logrus.WithError(err1).WithField("dir", tmpDir). | ||
| Warn("failed to remove tmp dir") | ||
| } | ||
| return | ||
| } | ||
|
|
||
| if err = os.Rename(runtimeDir, runtimeDir+"-old"); err != nil { | ||
| return | ||
| } | ||
| if err = os.Rename(tmpDir, runtimeDir); err != nil { | ||
| err = errors.Wrap(err, "failed to setup runtimes dir, new containers may not start") | ||
| return | ||
| } | ||
| if err = os.RemoveAll(runtimeDir + "-old"); err != nil { | ||
| logrus.WithError(err).WithField("dir", tmpDir). | ||
| Warn("failed to remove old runtimes dir") | ||
| } | ||
| }() | ||
|
|
||
| for name, rt := range runtimes { | ||
| if len(rt.Args) == 0 { | ||
| continue | ||
| } | ||
|
|
||
| script := filepath.Join(tmpDir, name) | ||
| content := fmt.Sprintf("#!/bin/sh\n%s %s $@\n", rt.Path, strings.Join(rt.Args, " ")) | ||
| if err := ioutil.WriteFile(script, []byte(content), 0700); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // rewriteRuntimePath is used for runtimes which have custom arguments supplied. | ||
| // This is needed because the containerd API only calls the OCI runtime binary, there is no options for extra arguments. | ||
| // To support this case, the daemon wraps the specified runtime in a script that passes through those arguments. | ||
| func (daemon *Daemon) rewriteRuntimePath(name, p string, args []string) (string, error) { | ||
| if len(args) == 0 { | ||
| return p, nil | ||
| } | ||
|
|
||
| // Check that the runtime path actually exists here so that we can return a well known error. | ||
| if _, err := exec.LookPath(p); err != nil { | ||
| return "", errors.Wrap(err, "error while looking up the specified runtime path") | ||
| } | ||
|
|
||
| return filepath.Join(daemon.configStore.Root, "runtimes", name), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.