diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-18 02:07:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 02:07:43 +0200 |
| commit | b2734baee5637ec4440a40cca8ff5ebab377739f (patch) | |
| tree | 8f30f7c55ed5e7d31d32379ec4e8bbdaadab1b6e /pkg/adapter/pods.go | |
| parent | 1c02905ec7af9f63a35ee05e9e9ce594c45c4c58 (diff) | |
| parent | 6f35a5742313a8406bcc197e0696c504d18793ff (diff) | |
| download | podman-b2734baee5637ec4440a40cca8ff5ebab377739f.tar.gz podman-b2734baee5637ec4440a40cca8ff5ebab377739f.tar.bz2 podman-b2734baee5637ec4440a40cca8ff5ebab377739f.zip | |
Merge pull request #3588 from haircommander/play-kube-command
Fix play kube command
Diffstat (limited to 'pkg/adapter/pods.go')
| -rw-r--r-- | pkg/adapter/pods.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go index b45b02d09..2ca4f228f 100644 --- a/pkg/adapter/pods.go +++ b/pkg/adapter/pods.go @@ -676,7 +676,7 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container if imageData != nil && imageData.Config != nil { containerConfig.Command = append(containerConfig.Command, imageData.Config.Entrypoint...) } - if len(containerConfig.Command) != 0 { + if len(containerYAML.Command) != 0 { containerConfig.Command = append(containerConfig.Command, containerYAML.Command...) } else if imageData != nil && imageData.Config != nil { containerConfig.Command = append(containerConfig.Command, imageData.Config.Cmd...) |