Skip to content
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

incusd/instance/lxc: Handle OCI containers using real PID1 #1005

Merged
merged 2 commits into from
Jul 17, 2024
Merged

incusd/instance/lxc: Handle OCI containers using real PID1 #1005

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d8b9c8
incusd/instance/lxc: Handle OCI containers using real PID1
stgraber Jul 16, 2024
acb84c6
incusd/instance/lxc: Add basic Mounts handling for OCI
stgraber Jul 17, 2024
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
44 changes: 41 additions & 3 deletions internal/server/instance/drivers/driver_lxc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2328,9 +2328,18 @@ func (d *lxc) startCommon() (string, []func() error, error) {
}

// Configure the entry point.
err = lxcSetConfigItem(cc, "lxc.execute.cmd", shellquote.Join(config.Process.Args...))
if err != nil {
return "", nil, err
if len(config.Process.Args) > 0 && slices.Contains([]string{"/sbin/init", "/s6-init"}, config.Process.Args[0]) {
// For regular init systems, call them directly as PID1.
err = lxcSetConfigItem(cc, "lxc.init.cmd", shellquote.Join(config.Process.Args...))
if err != nil {
return "", nil, err
}
} else {
// For anything else, run them under our own PID1.
err = lxcSetConfigItem(cc, "lxc.execute.cmd", shellquote.Join(config.Process.Args...))
if err != nil {
return "", nil, err
}
}

err = lxcSetConfigItem(cc, "lxc.init.cwd", config.Process.Cwd)
Expand All @@ -2348,6 +2357,35 @@ func (d *lxc) startCommon() (string, []func() error, error) {
return "", nil, err
}

// Get all mounts so far.
lxcMounts := []string{"/dev", "/proc", "/sys", "/sys/fs/cgroup"}
for _, mount := range cc.ConfigItem("lxc.mount.entry") {
fields := strings.Split(mount, " ")
if len(fields) < 2 || fields[1][0] == '/' {
continue
}

lxcMounts = append(lxcMounts, fmt.Sprintf("/%s", fields[1]))
}

// Configure mounts.
for _, mount := range config.Mounts {
// We only support simple tmpfs at this stage.
if len(mount.UIDMappings) > 0 || len(mount.GIDMappings) > 0 || mount.Type != "tmpfs" {
continue
}

// Skip all our own mounts.
if slices.Contains(lxcMounts, mount.Destination) {
continue
}

err := lxcSetConfigItem(cc, "lxc.mount.entry", fmt.Sprintf("%s %s %s %s 0 0", mount.Source, strings.TrimLeft(mount.Destination, "/"), mount.Type, strings.Join(append(mount.Options, "create=dir"), ",")))
if err != nil {
return "", nil, err
}
}

// Configure network handling.
err = os.MkdirAll(filepath.Join(d.Path(), "network"), 0711)
if err != nil {
Expand Down
Loading