Get rid of docker pause containers with a custom runtime. Closes #15086 #20017
Conversation
apollo13
force-pushed
the
no-docker-pause
branch
from
a180f30
to
a48ea61
Compare
| hostConfig.NetworkMode = netMode | ||
| if d.config.NewNetworking { | ||
| // "host" is not actually true here, it will cause joining the existing namespace | ||
| hostConfig.NetworkMode = "host" |
There was a problem hiding this comment.
Might still be better to use "none" here and test if it still works? But the differences are probably marginal. docker network inspect host/none will show the containers either way, even if they are not really attached.
| @@ -951,6 +951,10 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T | |||
| if _, ok := d.config.allowRuntimes[containerRuntime]; !ok && containerRuntime != "" { | |||
| return c, fmt.Errorf("requested runtime %q is not allowed", containerRuntime) | |||
| } | |||
| if d.config.NewNetworking && containerRuntime == "" { | |||
| // TODO: Maybe make nicer, but nomad does the trick for now | |||
| containerRuntime = "nomad" | |||
There was a problem hiding this comment.
Okay, docker info (and the equivalent API call) allows us to query the runtimes:
"Runtimes": {
"io.containerd.runc.v2": {
"path": "runc"
},
"nomad": {
"path": "/usr/local/bin/nomad-runc"
},
"runc": {
"path": "runc"
}
},
With that we can put the path & args for the requested runtime into the annotation and defer to that.
There was a problem hiding this comment.
Runtimes like gvisor have their own shim as well (containerd-shim-runsc-v1) in addition to runsc for the oci compliant interface. We can only support the latter and not the shims (unless we build a shim to proxy everything as well).
apollo13
force-pushed
the
no-docker-pause
branch
from
a48ea61
to
9b306f1
Compare
tgross
added
the
stage/needs-rebase
No description provided.