mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2025-06-26 18:18:24 +00:00
Merge pull request #1145 from elezar/remove-docker-runc
Some checks failed
Some checks failed
Remove docker-run as default runtime candidate
This commit is contained in:
commit
b33d475ff3
@ -21,8 +21,8 @@ The `runtimes` config option allows for the low-level runtime to be specified. T
|
|||||||
The default value for this setting is:
|
The default value for this setting is:
|
||||||
```toml
|
```toml
|
||||||
runtimes = [
|
runtimes = [
|
||||||
"docker-runc",
|
|
||||||
"runc",
|
"runc",
|
||||||
|
"crun",
|
||||||
]
|
]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var availableRuntimes = map[string]struct{}{"docker": {}, "crio": {}, "containerd": {}}
|
var availableRuntimes = map[string]struct{}{"docker": {}, "crio": {}, "containerd": {}}
|
||||||
var defaultLowLevelRuntimes = []string{"docker-runc", "runc", "crun"}
|
var defaultLowLevelRuntimes = []string{"runc", "crun"}
|
||||||
|
|
||||||
var waitingForSignal = make(chan bool, 1)
|
var waitingForSignal = make(chan bool, 1)
|
||||||
var signalReceived = make(chan bool, 1)
|
var signalReceived = make(chan bool, 1)
|
||||||
|
@ -67,7 +67,7 @@ swarm-resource = ""
|
|||||||
debug = "/dev/null"
|
debug = "/dev/null"
|
||||||
log-level = "info"
|
log-level = "info"
|
||||||
mode = "auto"
|
mode = "auto"
|
||||||
runtimes = ["docker-runc", "runc", "crun"]
|
runtimes = ["runc", "crun"]
|
||||||
|
|
||||||
[nvidia-container-runtime.modes]
|
[nvidia-container-runtime.modes]
|
||||||
|
|
||||||
@ -131,7 +131,7 @@ swarm-resource = ""
|
|||||||
debug = "/dev/null"
|
debug = "/dev/null"
|
||||||
log-level = "info"
|
log-level = "info"
|
||||||
mode = "auto"
|
mode = "auto"
|
||||||
runtimes = ["docker-runc", "runc", "crun"]
|
runtimes = ["runc", "crun"]
|
||||||
|
|
||||||
[nvidia-container-runtime.modes]
|
[nvidia-container-runtime.modes]
|
||||||
|
|
||||||
@ -198,7 +198,7 @@ swarm-resource = ""
|
|||||||
debug = "/dev/null"
|
debug = "/dev/null"
|
||||||
log-level = "info"
|
log-level = "info"
|
||||||
mode = "auto"
|
mode = "auto"
|
||||||
runtimes = ["docker-runc", "runc", "crun"]
|
runtimes = ["runc", "crun"]
|
||||||
|
|
||||||
[nvidia-container-runtime.modes]
|
[nvidia-container-runtime.modes]
|
||||||
|
|
||||||
@ -262,7 +262,7 @@ swarm-resource = ""
|
|||||||
debug = "/dev/null"
|
debug = "/dev/null"
|
||||||
log-level = "info"
|
log-level = "info"
|
||||||
mode = "auto"
|
mode = "auto"
|
||||||
runtimes = ["docker-runc", "runc", "crun"]
|
runtimes = ["runc", "crun"]
|
||||||
|
|
||||||
[nvidia-container-runtime.modes]
|
[nvidia-container-runtime.modes]
|
||||||
|
|
||||||
@ -348,7 +348,7 @@ swarm-resource = ""
|
|||||||
debug = "/dev/null"
|
debug = "/dev/null"
|
||||||
log-level = "info"
|
log-level = "info"
|
||||||
mode = "auto"
|
mode = "auto"
|
||||||
runtimes = ["docker-runc", "runc", "crun"]
|
runtimes = ["runc", "crun"]
|
||||||
|
|
||||||
[nvidia-container-runtime.modes]
|
[nvidia-container-runtime.modes]
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ func GetDefault() (*Config, error) {
|
|||||||
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
||||||
DebugFilePath: "/dev/null",
|
DebugFilePath: "/dev/null",
|
||||||
LogLevel: "info",
|
LogLevel: "info",
|
||||||
Runtimes: []string{"docker-runc", "runc", "crun"},
|
Runtimes: []string{"runc", "crun"},
|
||||||
Mode: "auto",
|
Mode: "auto",
|
||||||
Modes: modesConfig{
|
Modes: modesConfig{
|
||||||
CSV: csvModeConfig{
|
CSV: csvModeConfig{
|
||||||
|
@ -63,7 +63,7 @@ func TestGetConfig(t *testing.T) {
|
|||||||
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
||||||
DebugFilePath: "/dev/null",
|
DebugFilePath: "/dev/null",
|
||||||
LogLevel: "info",
|
LogLevel: "info",
|
||||||
Runtimes: []string{"docker-runc", "runc", "crun"},
|
Runtimes: []string{"runc", "crun"},
|
||||||
Mode: "auto",
|
Mode: "auto",
|
||||||
Modes: modesConfig{
|
Modes: modesConfig{
|
||||||
CSV: csvModeConfig{
|
CSV: csvModeConfig{
|
||||||
@ -170,7 +170,7 @@ func TestGetConfig(t *testing.T) {
|
|||||||
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
||||||
DebugFilePath: "/dev/null",
|
DebugFilePath: "/dev/null",
|
||||||
LogLevel: "info",
|
LogLevel: "info",
|
||||||
Runtimes: []string{"docker-runc", "runc", "crun"},
|
Runtimes: []string{"runc", "crun"},
|
||||||
Mode: "auto",
|
Mode: "auto",
|
||||||
Modes: modesConfig{
|
Modes: modesConfig{
|
||||||
CSV: csvModeConfig{
|
CSV: csvModeConfig{
|
||||||
@ -289,7 +289,7 @@ func TestGetConfig(t *testing.T) {
|
|||||||
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
||||||
DebugFilePath: "/dev/null",
|
DebugFilePath: "/dev/null",
|
||||||
LogLevel: "info",
|
LogLevel: "info",
|
||||||
Runtimes: []string{"docker-runc", "runc", "crun"},
|
Runtimes: []string{"runc", "crun"},
|
||||||
Mode: "auto",
|
Mode: "auto",
|
||||||
Modes: modesConfig{
|
Modes: modesConfig{
|
||||||
CSV: csvModeConfig{
|
CSV: csvModeConfig{
|
||||||
@ -331,7 +331,7 @@ func TestGetConfig(t *testing.T) {
|
|||||||
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
NVIDIAContainerRuntimeConfig: RuntimeConfig{
|
||||||
DebugFilePath: "/dev/null",
|
DebugFilePath: "/dev/null",
|
||||||
LogLevel: "info",
|
LogLevel: "info",
|
||||||
Runtimes: []string{"docker-runc", "runc", "crun"},
|
Runtimes: []string{"runc", "crun"},
|
||||||
Mode: "auto",
|
Mode: "auto",
|
||||||
Modes: modesConfig{
|
Modes: modesConfig{
|
||||||
CSV: csvModeConfig{
|
CSV: csvModeConfig{
|
||||||
|
@ -62,7 +62,7 @@ load-kmods = true
|
|||||||
#debug = "/var/log/nvidia-container-runtime.log"
|
#debug = "/var/log/nvidia-container-runtime.log"
|
||||||
log-level = "info"
|
log-level = "info"
|
||||||
mode = "auto"
|
mode = "auto"
|
||||||
runtimes = ["docker-runc", "runc", "crun"]
|
runtimes = ["runc", "crun"]
|
||||||
|
|
||||||
[nvidia-container-runtime.modes]
|
[nvidia-container-runtime.modes]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user