Merge pull request #436 from marcov/libcontainer-tmp

Julio Montes · web-flow · commit 29f3fe9bb75d · 2018-12-17T12:11:05.000-06:00
libcontainer: use /run as root containers path
diff --git a/grpc.go b/grpc.go
@@ -45,6 +45,7 @@ type agentGRPC struct {
 const (
 	cpuRegexpPattern = "cpu[0-9]*"
 	memRegexpPattern = "memory[0-9]*"
+	libcontainerPath = "/run/libcontainer"
 )
 
 var (
@@ -539,7 +540,7 @@ func (a *agentGRPC) rollbackFailingContainerCreation(ctr *container) {
 }
 
 func (a *agentGRPC) finishCreateContainer(ctr *container, req *pb.CreateContainerRequest, config *configs.Config) (resp *gpb.Empty, err error) {
-	containerPath := filepath.Join("/tmp/libcontainer", a.sandbox.id)
+	containerPath := filepath.Join(libcontainerPath, a.sandbox.id)
 	factory, err := libcontainer.New(containerPath, libcontainer.Cgroupfs)
 	if err != nil {
 		return emptyResp, err

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ type agentGRPC struct {`
`45`	`45`	`const (`
`46`	`46`	`cpuRegexpPattern = "cpu[0-9]*"`
`47`	`47`	`memRegexpPattern = "memory[0-9]*"`
	`48`	`+ libcontainerPath = "/run/libcontainer"`
`48`	`49`	`)`
`49`	`50`
`50`	`51`	`var (`
`@@ -539,7 +540,7 @@ func (a agentGRPC) rollbackFailingContainerCreation(ctr container) {`
`539`	`540`	`}`
`540`	`541`
`541`	`542`	`func (a agentGRPC) finishCreateContainer(ctr container, req pb.CreateContainerRequest, config configs.Config) (resp *gpb.Empty, err error) {`
`542`		`- containerPath := filepath.Join("/tmp/libcontainer", a.sandbox.id)`
	`543`	`+ containerPath := filepath.Join(libcontainerPath, a.sandbox.id)`
`543`	`544`	`factory, err := libcontainer.New(containerPath, libcontainer.Cgroupfs)`
`544`	`545`	`if err != nil {`
`545`	`546`	`return emptyResp, err`