vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #545 from runcom/fix-hostspecific-spec

Browse source 
server: container_create: make the spec hostspecific
This commit is contained in:
Mrunal Patel 2017-05-30 11:49:22 -07:00 committed by GitHub
commit 42d2fa6576
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/container_create.go
View file

@ -330,6 +330,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
// creates a spec Generator with the default spec. // creates a spec Generator with the default spec.
specgen := generate.New() specgen := generate.New()
specgen.HostSpecific = true
if err := addOciBindMounts(sb, containerConfig, &specgen); err != nil { if err := addOciBindMounts(sb, containerConfig, &specgen); err != nil {
return nil, err return nil, err
@ -456,7 +457,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
if dropCaps != nil { if dropCaps != nil {
for _, cap := range dropCaps { for _, cap := range dropCaps {
if err := specgen.DropProcessCapability(toCAPPrefixed(cap)); err != nil { if err := specgen.DropProcessCapability(toCAPPrefixed(cap)); err != nil {
return nil, err logrus.Debugf("failed to drop cap %s: %v", toCAPPrefixed(cap), err)
} }
} }
} }