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

Set gid 0 when no group is specified

Browse Source 
This change is to match Docker's implementaion of setting gid and groups
to 0 when no gid is specified but an explicit uid is set.

Fixes #2527

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2018-08-06 15:08:59 -04:00
parent dd97a11b6f
commit 99df1a9e11
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
container_linux_test.go
View File

@ -1321,3 +1321,38 @@ func TestContainerNoImage(t *testing.T) {
t.Fatalf("expected error to be %s but received %s", errdefs.ErrNotFound, err) t.Fatalf("expected error to be %s but received %s", errdefs.ErrNotFound, err)
} }
} }
func TestUIDNoGID(t *testing.T) {
t.Parallel()
ctx, cancel := testContext()
defer cancel()
id := t.Name()
client, err := newClient(t, address)
if err != nil {
t.Fatal(err)
}
defer client.Close()
image, err := client.GetImage(ctx, testImage)
if err != nil {
t.Fatal(err)
}
container, err := client.NewContainer(ctx, id, WithNewSnapshot(id, image), WithNewSpec(oci.WithUserID(1000)))
if err != nil {
t.Fatal(err)
}
defer container.Delete(ctx)
spec, err := container.Spec(ctx)
if err != nil {
t.Fatal(err)
}
if uid := spec.Process.User.UID; uid != 1000 {
t.Fatalf("expected uid 1000 but received %d", uid)
}
if gid := spec.Process.User.GID; gid != 0 {
t.Fatalf("expected gid 0 but received %d", gid)
}
}

4
oci/spec_opts_unix.go
View File

@ -371,7 +371,7 @@ func WithUserID(uid uint32) SpecOpts {
}) })
if err != nil { if err != nil {
if os.IsNotExist(err) || err == errNoUsersFound { if os.IsNotExist(err) || err == errNoUsersFound {
s.Process.User.UID, s.Process.User.GID = uid, uid s.Process.User.UID, s.Process.User.GID = uid, 0
return nil return nil
} }
return err return err
@ -397,7 +397,7 @@ func WithUserID(uid uint32) SpecOpts {
}) })
if err != nil { if err != nil {
if os.IsNotExist(err) || err == errNoUsersFound { if os.IsNotExist(err) || err == errNoUsersFound {
s.Process.User.UID, s.Process.User.GID = uid, uid s.Process.User.UID, s.Process.User.GID = uid, 0
return nil return nil
} }
return err return err