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

Merge pull request #563 from rhatdan/master

Browse source 
Need to be consistent in out nameing of OCI
This commit is contained in:
Mrunal Patel 2017-06-05 18:09:52 -07:00 committed by GitHub
commit fee5291495
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/container_create.go
View file

@ -35,7 +35,7 @@ const (
seccompLocalhostPrefix = "localhost/" seccompLocalhostPrefix = "localhost/"
) )
func addOciBindMounts(sb *sandbox, containerConfig *pb.ContainerConfig, specgen *generate.Generator) error { func addOCIBindMounts(sb *sandbox, containerConfig *pb.ContainerConfig, specgen *generate.Generator) error {
mounts := containerConfig.GetMounts() mounts := containerConfig.GetMounts()
for _, mount := range mounts { for _, mount := range mounts {
dest := mount.ContainerPath dest := mount.ContainerPath
@ -337,7 +337,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
specgen := generate.New() specgen := generate.New()
specgen.HostSpecific = true 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
} }