github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ctr/tasks: support remapped UID/GID

Browse Source 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
This commit is contained in:
Iceber Gu
2022-12-23 11:00:44 +08:00
parent f50dce84f8
commit b91f42a146
6 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/ctr/commands/run/run_unix.go
View File

@@ -40,7 +40,6 @@ import (
"github.com/containerd/containerd/snapshots"
"github.com/intel/goresctrl/pkg/blockio"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
@@ -431,30 +430,6 @@ func getRuntimeOptions(context *cli.Context) (interface{}, error) {
return nil, nil
}
func getNewTaskOpts(context *cli.Context) []containerd.NewTaskOpts {
var (
tOpts []containerd.NewTaskOpts
)
if context.Bool("no-pivot") {
tOpts = append(tOpts, containerd.WithNoPivotRoot)
}
if uidmap := context.String("uidmap"); uidmap != "" {
uidMap, err := parseIDMapping(uidmap)
if err != nil {
logrus.WithError(err).Warn("unable to parse uidmap; defaulting to uid 0 IO ownership")
}
tOpts = append(tOpts, containerd.WithUIDOwner(uidMap.HostID))
}
if gidmap := context.String("gidmap"); gidmap != "" {
gidMap, err := parseIDMapping(gidmap)
if err != nil {
logrus.WithError(err).Warn("unable to parse gidmap; defaulting to gid 0 IO ownership")
}
tOpts = append(tOpts, containerd.WithGIDOwner(gidMap.HostID))
}
return tOpts
}
func parseIDMapping(mapping string) (specs.LinuxIDMapping, error) {
// We expect 3 parts, but limit to 4 to allow detection of invalid values.
parts := strings.SplitN(mapping, ":", 4)