From fa6ba6802618e3e23746c4b4707fb403a55514ae Mon Sep 17 00:00:00 2001
From: zhangguanzhang <zhangguanzhang@qq.com>
Date: Sat, 22 Aug 2020 18:15:53 +0800
Subject: fix apiv2 will create containers with incorrect commands

Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
---
 pkg/api/handlers/compat/containers.go        | 10 +++++++++-
 pkg/api/handlers/compat/containers_create.go | 13 +++++++------
 pkg/spec/spec.go                             | 11 ++++++++++-
 3 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'pkg')

diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 6943b15ff..1ae6a990b 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -319,6 +319,14 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 		SizeRootFs:      &inspect.SizeRootFs,
 	}
 
+	// set Path and Args
+	processArgs := l.Config().Spec.Process.Args
+	if len(processArgs) > 0 {
+		cb.Path = processArgs[0]
+	}
+	if len(processArgs) > 1 {
+		cb.Args = processArgs[1:]
+	}
 	stopTimeout := int(l.StopTimeout())
 
 	exposedPorts := make(nat.PortSet)
@@ -346,7 +354,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 		OpenStdin:       inspect.Config.OpenStdin,
 		StdinOnce:       inspect.Config.StdinOnce,
 		Env:             inspect.Config.Env,
-		Cmd:             inspect.Config.Cmd,
+		Cmd:             l.Command(),
 		Healthcheck:     nil,
 		ArgsEscaped:     false,
 		Image:           imageName,
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go
index 8238d2d93..93e4fe540 100644
--- a/pkg/api/handlers/compat/containers_create.go
+++ b/pkg/api/handlers/compat/containers_create.go
@@ -87,20 +87,21 @@ func makeCreateConfig(ctx context.Context, containerConfig *config.Config, input
 		workDir = input.WorkingDir
 	}
 
-	if input.Entrypoint == nil {
-		entrypointSlice, err := newImage.Entrypoint(ctx)
+	// Only use image's Cmd when the user does not set the entrypoint
+	if input.Entrypoint == nil && len(input.Cmd) == 0 {
+		cmdSlice, err := newImage.Cmd(ctx)
 		if err != nil {
 			return createconfig.CreateConfig{}, err
 		}
-		input.Entrypoint = entrypointSlice
+		input.Cmd = cmdSlice
 	}
 
-	if len(input.Cmd) == 0 {
-		cmdSlice, err := newImage.Cmd(ctx)
+	if input.Entrypoint == nil {
+		entrypointSlice, err := newImage.Entrypoint(ctx)
 		if err != nil {
 			return createconfig.CreateConfig{}, err
 		}
-		input.Cmd = cmdSlice
+		input.Entrypoint = entrypointSlice
 	}
 
 	stopTimeout := containerConfig.Engine.StopTimeout
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
index 893ae3cab..5e97620cc 100644
--- a/pkg/spec/spec.go
+++ b/pkg/spec/spec.go
@@ -180,7 +180,16 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
 		g.AddMount(cgroupMnt)
 	}
 	g.SetProcessCwd(config.WorkDir)
-	g.SetProcessArgs(config.Command)
+
+	ProcessArgs := make([]string, 0)
+	if len(config.Entrypoint) > 0 {
+		ProcessArgs = config.Entrypoint
+	}
+	if len(config.Command) > 0 {
+		ProcessArgs = append(ProcessArgs, config.Command...)
+	}
+	g.SetProcessArgs(ProcessArgs)
+
 	g.SetProcessTerminal(config.Tty)
 
 	for key, val := range config.Annotations {
-- 
cgit v1.2.3-54-g00ecf