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

Merge pull request #46723 from laurazard/cleanup-redundant-calls

Browse source 
daemon/exec_linux: assorted cleanups
This commit is contained in:
Sebastiaan van Stijn 2023-10-26 09:54:51 +02:00 • committed by GitHub
commit 1b9411ef77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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"
"github.com/containerd/containerd"
"github.com/containerd/containerd/oci"
coci "github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/apparmor"
"github.com/docker/docker/container"
@ -29,7 +28,7 @@ func getUserFromContainerd(ctx context.Context, containerdCli *containerd.Client
return specs.User{}, err
}
opts := []oci.SpecOpts{
opts := []coci.SpecOpts{
coci.WithUser(ec.User),
coci.WithAdditionalGIDs(ec.User),
coci.WithAppendAdditionalGroups(ec.Container.HostConfig.GroupAdd...),