beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup duplicate imports

Browse source 
Kept `coci` import alias since we use it elsewhere,
maybe to prevent confusion with our own `oci` package.

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
This commit is contained in:
Laura Brehm 2023-10-25 16:18:32 +01:00
parent fc4d035e7a
commit 9d578a2e6d
No known key found for this signature in database
GPG key ID: CFBF847B4A313468
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/exec_linux.go
View file

@ -4,7 +4,6 @@ import (
"context" "context"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/oci"
coci "github.com/containerd/containerd/oci" coci "github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/apparmor" "github.com/containerd/containerd/pkg/apparmor"
"github.com/docker/docker/container" "github.com/docker/docker/container"
@ -29,7 +28,7 @@ func getUserFromContainerd(ctx context.Context, containerdCli *containerd.Client
return specs.User{}, err return specs.User{}, err
} }
opts := []oci.SpecOpts{ opts := []coci.SpecOpts{
coci.WithUser(ec.User), coci.WithUser(ec.User),
coci.WithAdditionalGIDs(ec.User), coci.WithAdditionalGIDs(ec.User),
coci.WithAppendAdditionalGroups(ec.Container.HostConfig.GroupAdd...), coci.WithAppendAdditionalGroups(ec.Container.HostConfig.GroupAdd...),