InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: getCD: remove use of parsers.ParseKeyValueOpt

Browse Source 
We were discarding the error returned by it, and its functionality
is very minimal, so inline the equivalent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-11-28 13:18:53 +01:00
parent 4d2fbe325a
commit 68a98a7263
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/daemon_unix.go
View File

@@ -38,7 +38,6 @@ import (
lntypes "github.com/docker/docker/libnetwork/types"
"github.com/docker/docker/opts"
"github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/sysinfo"
"github.com/docker/docker/runconfig"
@@ -584,11 +583,10 @@ func cgroupDriver(cfg *config.Config) string {
// getCD gets the raw value of the native.cgroupdriver option, if set.
func getCD(config *config.Config) string {
for _, option := range config.ExecOptions {
key, val, err := parsers.ParseKeyValueOpt(option)
if err != nil || !strings.EqualFold(key, "native.cgroupdriver") {
continue
key, val, ok := strings.Cut(option, "=")
if ok && strings.EqualFold(strings.TrimSpace(key), "native.cgroupdriver") {
return strings.TrimSpace(val)
}
return val
}
return ""
}