Skip to content

revert: "docker: fix cgroupdriver" #1314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abiosoft merged 1 commit into from
May 7, 2025
Merged

revert: "docker: fix cgroupdriver" #1314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions environment/container/docker/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ func getHostGatewayIp(d dockerRuntime, conf map[string]any) (string, error) {
return ip, nil
}

func (d dockerRuntime) isSystemd() bool {
output, _ := d.guest.RunOutput("sh", "-c", "[ -S /run/systemd/private ] && printf true || printf false")
return output == "true"
}

func (d dockerRuntime) createDaemonFile(conf map[string]any, env map[string]string) error {
if conf == nil {
conf = map[string]any{}
Expand All @@ -44,24 +39,11 @@ func (d dockerRuntime) createDaemonFile(conf map[string]any, env map[string]stri
conf["features"] = map[string]any{"buildkit": true}
}

// set cgroupdriver for k3s (if not set by user)
cgroupDriver := "cgroupfs"
if d.isSystemd() {
cgroupDriver = "systemd"
}
// enable cgroupfs for k3s (if not set by user)
if _, ok := conf["exec-opts"]; !ok {
conf["exec-opts"] = []string{"native.cgroupdriver=" + cgroupDriver}
conf["exec-opts"] = []string{"native.cgroupdriver=cgroupfs"}
} else if opts, ok := conf["exec-opts"].([]string); ok {
manualCgroupDriver := false
for _, opt := range opts {
if strings.HasPrefix(opt, "native.cgroupdriver=") {
manualCgroupDriver = true
break
}
}
if !manualCgroupDriver {
conf["exec-opts"] = append(opts, "native.cgroupdriver="+cgroupDriver)
}
conf["exec-opts"] = append(opts, "native.cgroupdriver=cgroupfs")
}
// remove host-gateway-ip if set by the user
// to avoid clash with systemd configuration
Expand Down
Loading