Merge pull request #2856 from haircommander/kube-entrypoint

Respect image entrypoint in play kube

1 files changed, 13 insertions, 1 deletions

diff --git a/cmd/podman/play_kube.go b/cmd/podman/play_kube.go
index 56d80070c..cbe961279 100644
--- a/cmd/podman/play_kube.go
+++ b/cmd/podman/play_kube.go
@@ -269,7 +269,19 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container
 		}
 	}
 
-	containerConfig.Command = containerYAML.Command
+	containerConfig.Command = []string{}
+	if imageData != nil && imageData.Config != nil {
+		containerConfig.Command = append(containerConfig.Command, imageData.Config.Entrypoint...)
+	}
+	if len(containerConfig.Command) != 0 {
+		containerConfig.Command = append(containerConfig.Command, containerYAML.Command...)
+	} else if imageData != nil && imageData.Config != nil {
+		containerConfig.Command = append(containerConfig.Command, imageData.Config.Cmd...)
+	}
+	if imageData != nil && len(containerConfig.Command) == 0 {
+		return nil, errors.Errorf("No command specified in container YAML or as CMD or ENTRYPOINT in this image for %s", containerConfig.Name)
+	}
+
 	containerConfig.StopSignal = 15
 
 	// If the user does not pass in ID mappings, just set to basics