Merge pull request #1045 from YaoZengzeng/entrypoint

bugfix: distinguish cmd and entrypoint better
AliyunContainerService · Apr 4, 2018 · 55fbc1a · 55fbc1a
2 parents eb8484d + 861cc1d
commit 55fbc1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/daemon/mgr/container_types.go b/daemon/mgr/container_types.go
@@ -171,12 +171,14 @@ func (meta *ContainerMeta) merge(getconfig func() (v1.ImageConfig, error)) error
 		return err
 	}
 
+	// If user specify the Entrypoint, no need to merge image's configuration.
+	// Otherwise use the image's configuration to fill it.
 	if len(meta.Config.Entrypoint) == 0 {
+		if len(meta.Config.Cmd) == 0 {
+			meta.Config.Cmd = config.Cmd
+		}
 		meta.Config.Entrypoint = config.Entrypoint
 	}
-	if len(meta.Config.Cmd) == 0 {
-		meta.Config.Cmd = config.Cmd
-	}
 	if meta.Config.Env == nil {
 		meta.Config.Env = config.Env
 	} else {

diff --git a/daemon/mgr/cri.go b/daemon/mgr/cri.go
@@ -424,7 +424,8 @@ func (c *CriManager) CreateContainer(ctx context.Context, r *runtime.CreateConta
 	}
 	createConfig := &apitypes.ContainerCreateConfig{
 		ContainerConfig: apitypes.ContainerConfig{
-			Cmd:        append(config.Command, config.Args...),
+			Entrypoint: config.Command,
+			Cmd:        config.Args,
 			Env:        generateEnvList(config.GetEnvs()),
 			Image:      image,
 			WorkingDir: config.WorkingDir,