Merge pull request #1068 from Random-Liu/cherrypick-#1055-release-1.0

Random-Liu · web-flow · commit d35c6741eb82 · 2019-02-28T17:50:51.000-08:00
Cherrypick #1055 release 1.0
diff --git a/pkg/server/container_create.go b/pkg/server/container_create.go
@@ -201,7 +201,7 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
 
 	// Get container log path.
 	if config.GetLogPath() != "" {
-		meta.LogPath = filepath.Join(sandbox.Config.GetLogDirectory(), config.GetLogPath())
+		meta.LogPath = filepath.Join(sandboxConfig.GetLogDirectory(), config.GetLogPath())
 	}
 
 	containerIO, err := cio.NewContainerIO(id,

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func (c criService) CreateContainer(ctx context.Context, r runtime.CreateConta`
`201`	`201`
`202`	`202`	`// Get container log path.`
`203`	`203`	`if config.GetLogPath() != "" {`
`204`		`- meta.LogPath = filepath.Join(sandbox.Config.GetLogDirectory(), config.GetLogPath())`
	`204`	`+ meta.LogPath = filepath.Join(sandboxConfig.GetLogDirectory(), config.GetLogPath())`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`containerIO, err := cio.NewContainerIO(id,`