diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-14 16:16:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-14 16:16:08 +0200 |
| commit | 4823cf8fcc460f2d4f8707ff603234baff9d452a (patch) | |
| tree | 97c466bae96c8326fadf8833400bb9312eb1266c /pkg | |
| parent | a734b53357a84d5156e2902113e72d9384f9515b (diff) | |
| parent | fb9e1d7d9f332e513d392c7b8ccf1093807bb1a0 (diff) | |
| download | podman-4823cf8fcc460f2d4f8707ff603234baff9d452a.tar.gz podman-4823cf8fcc460f2d4f8707ff603234baff9d452a.tar.bz2 podman-4823cf8fcc460f2d4f8707ff603234baff9d452a.zip | |
Merge pull request #3809 from chenzhiwei/fix-play-kube
Fix play kube command in pod yaml
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/pods.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go index e25238956..2743dfdc6 100644 --- a/pkg/adapter/pods.go +++ b/pkg/adapter/pods.go @@ -707,6 +707,8 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container return nil, errors.Errorf("No command specified in container YAML or as CMD or ENTRYPOINT in this image for %s", containerConfig.Name) } + containerConfig.UserCommand = containerConfig.Command + containerConfig.StopSignal = 15 // If the user does not pass in ID mappings, just set to basics |