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

server: containers restore

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-10-07 16:20:04 +02:00
parent cc732301ac
commit 54d6ddb5af
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
3 changed files with 99 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/container.go
View file

@ -1,6 +1,7 @@
package server
import (
"encoding/json"
"errors"
"fmt"
"os"
@ -204,7 +205,6 @@ func (s *Server) createSandboxContainer(containerID string, containerName string
specgen.AddAnnotation(k, v)
}
}
if containerConfig.GetPrivileged() {
specgen.SetupPrivileged(true)
}
@ -305,7 +305,18 @@ func (s *Server) createSandboxContainer(containerID string, containerName string
}
}
if err := specgen.SaveToFile(filepath.Join(containerDir, "config.json")); err != nil {
specgen.AddAnnotation("ocid/name", containerName)
specgen.AddAnnotation("ocid/sandbox_id", sb.id)
specgen.AddAnnotation("ocid/log_path", logPath)
specgen.AddAnnotation("ocid/tty", fmt.Sprintf("%v", containerConfig.GetTty()))
labelsJSON, err := json.Marshal(labels)
if err != nil {
return nil, err
}
specgen.AddAnnotation("ocid/labels", string(labelsJSON))
if err = specgen.SaveToFile(filepath.Join(containerDir, "config.json")); err != nil {
return nil, err
}
@ -321,7 +332,7 @@ func (s *Server) createSandboxContainer(containerID string, containerName string
// TODO: copy the rootfs into the bundle.
// Currently, utils.CreateFakeRootfs is used to populate the rootfs.
if err := utils.CreateFakeRootfs(containerDir, image); err != nil {
if err = utils.CreateFakeRootfs(containerDir, image); err != nil {
return nil, err
}