-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Akihiro Suda <[email protected]>
- Loading branch information
1 parent
8db1def
commit 048130d
Showing
41 changed files
with
36 additions
and
4,319 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,113 +1,40 @@ | ||
| package specconv | ||
|
|
||
| import ( | ||
| "os" | ||
| "sort" | ||
| "strings" | ||
|
|
||
| "github.com/opencontainers/runc/libcontainer/system" | ||
| "github.com/opencontainers/runc/libcontainer/user" | ||
| "github.com/opencontainers/runtime-spec/specs-go" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // ToRootless converts spec to be compatible with "rootless" runc. | ||
| // * Adds userns (Note: since we are already in userns, ideally we should not need to do this. runc-side issue is tracked at https://github.com/opencontainers/runc/issues/1837) | ||
| // * Fix up mount flags (same as above) | ||
| // * Replace /sys with bind-mount (FIXME: we don't need to do this if netns is unshared) | ||
| // * Remove /sys mount | ||
| // * Remove cgroups | ||
| // | ||
| // See docs/rootless.md for the supported runc revision. | ||
| func ToRootless(spec *specs.Spec) error { | ||
| if !system.RunningInUserNS() { | ||
| return errors.New("needs to be in user namespace") | ||
| } | ||
| uidMap, err := user.CurrentProcessUIDMap() | ||
| if err != nil && !os.IsNotExist(err) { | ||
| return err | ||
| } | ||
| gidMap, err := user.CurrentProcessUIDMap() | ||
| if err != nil && !os.IsNotExist(err) { | ||
| return err | ||
| } | ||
| return toRootless(spec, uidMap, gidMap) | ||
| } | ||
|
|
||
| // toRootless was forked from github.com/opencontainers/runc/libcontainer/specconv | ||
| func toRootless(spec *specs.Spec, uidMap, gidMap []user.IDMap) error { | ||
| if err := configureUserNS(spec, uidMap, gidMap); err != nil { | ||
| return err | ||
| } | ||
| if err := configureMounts(spec); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Remove cgroup settings. | ||
| spec.Linux.Resources = nil | ||
| spec.Linux.CgroupsPath = "" | ||
| return nil | ||
| } | ||
|
|
||
| // configureUserNS add suserns and the current ID map to the spec. | ||
| // Since we are already in userns, ideally we should not need to add userns. | ||
| // However, currently rootless runc always requires userns to be added. | ||
| // https://github.com/opencontainers/runc/issues/1837 | ||
| func configureUserNS(spec *specs.Spec, uidMap, gidMap []user.IDMap) error { | ||
| spec.Linux.Namespaces = append(spec.Linux.Namespaces, specs.LinuxNamespace{ | ||
| Type: specs.UserNamespace, | ||
| }) | ||
|
|
||
| sort.Slice(uidMap, func(i, j int) bool { return uidMap[i].ID < uidMap[j].ID }) | ||
| uNextContainerID := int64(0) | ||
| for _, u := range uidMap { | ||
| spec.Linux.UIDMappings = append(spec.Linux.UIDMappings, | ||
| specs.LinuxIDMapping{ | ||
| HostID: uint32(u.ID), | ||
| ContainerID: uint32(uNextContainerID), | ||
| Size: uint32(u.Count), | ||
| }) | ||
| uNextContainerID += int64(u.Count) | ||
| } | ||
| sort.Slice(gidMap, func(i, j int) bool { return gidMap[i].ID < gidMap[j].ID }) | ||
| gNextContainerID := int64(0) | ||
| for _, g := range gidMap { | ||
| spec.Linux.GIDMappings = append(spec.Linux.GIDMappings, | ||
| specs.LinuxIDMapping{ | ||
| HostID: uint32(g.ID), | ||
| ContainerID: uint32(gNextContainerID), | ||
| Size: uint32(g.Count), | ||
| }) | ||
| gNextContainerID += int64(g.Count) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func configureMounts(spec *specs.Spec) error { | ||
| // Remove /sys mount because we can't mount /sys when the daemon netns | ||
| // is not unshared from the host. | ||
| // | ||
| // Instead, we could bind-mount /sys from the host, however, `rbind, ro` | ||
| // does not make /sys/fs/cgroup read-only (and we can't bind-mount /sys | ||
| // without rbind) | ||
| // | ||
| // PR for making /sys/fs/cgroup read-only is proposed, but it is very | ||
| // complicated: https://github.com/opencontainers/runc/pull/1869 | ||
| // | ||
| // For buildkit usecase, we suppose we don't need to provide /sys to | ||
| // containers and remove /sys mount as a workaround. | ||
| var mounts []specs.Mount | ||
| for _, mount := range spec.Mounts { | ||
| // Ignore all mounts that are under /sys, because we add /sys later. | ||
| if strings.HasPrefix(mount.Destination, "/sys") { | ||
| continue | ||
| } | ||
|
|
||
| // Remove all gid= and uid= mappings. | ||
| // Since we are already in userns, ideally we should not need to do this. | ||
| // https://github.com/opencontainers/runc/issues/1837 | ||
| var options []string | ||
| for _, option := range mount.Options { | ||
| if !strings.HasPrefix(option, "gid=") && !strings.HasPrefix(option, "uid=") { | ||
| options = append(options, option) | ||
| } | ||
| } | ||
| mount.Options = options | ||
| mounts = append(mounts, mount) | ||
| } | ||
|
|
||
| // Add the sysfs mount as an rbind, because we can't mount /sys unless we have netns. | ||
| // TODO: keep original /sys mount when we have netns. | ||
| mounts = append(mounts, specs.Mount{ | ||
| Source: "/sys", | ||
| Destination: "/sys", | ||
| Type: "none", | ||
| Options: []string{"rbind", "nosuid", "noexec", "nodev", "ro"}, | ||
| }) | ||
| spec.Mounts = mounts | ||
|
|
||
| // Remove cgroups so as to avoid `container_linux.go:337: starting container process caused "process_linux.go:280: applying cgroup configuration for process caused \"mkdir /sys/fs/cgroup/cpuset/buildkit: permission denied\""` | ||
| spec.Linux.Resources = nil | ||
| spec.Linux.CgroupsPath = "" | ||
| return nil | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 0 additions & 61 deletions
61
vendor/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.