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

*: bump opencontainers/runtime-tools

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-11-24 12:26:11 +01:00
parent 2e3ad167bb
commit 70481bc5af
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
11 changed files with 2529 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server/container_create.go
View file

@ -149,9 +149,9 @@ func (s *Server) createSandboxContainer(containerID string, containerName string
return nil, fmt.Errorf("Mount.HostPath is empty")
}
options := "rw"
options := []string{"rw"}
if mount.GetReadonly() {
options = "ro"
options = []string{"ro"}
}
if mount.GetSelinuxRelabel() {
@ -162,7 +162,6 @@ func (s *Server) createSandboxContainer(containerID string, containerName string
}
specgen.AddBindMount(src, dest, options)
}
labels := containerConfig.GetLabels()
@ -283,7 +282,7 @@ func (s *Server) createSandboxContainer(containerID string, containerName string
}
specgen.AddAnnotation("ocid/labels", string(labelsJSON))
if err = specgen.SaveToFile(filepath.Join(containerDir, "config.json")); err != nil {
if err = specgen.SaveToFile(filepath.Join(containerDir, "config.json"), generate.ExportOptions{}); err != nil {
return nil, err
}