diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-13 13:20:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 13:20:26 +0200 |
| commit | e2a8e037d1c3a2176cd15493812bf165faea63f2 (patch) | |
| tree | e01065d69937d364a355441fd7df7fc90c8f0f37 /pkg/specgen/generate/pod_create.go | |
| parent | e38001f123a04f905a37bf038b2c983ebe350996 (diff) | |
| parent | c4627b5846ba16540dc61db91b059eb39555ec4a (diff) | |
| download | podman-e2a8e037d1c3a2176cd15493812bf165faea63f2.tar.gz podman-e2a8e037d1c3a2176cd15493812bf165faea63f2.tar.bz2 podman-e2a8e037d1c3a2176cd15493812bf165faea63f2.zip | |
Merge pull request #6896 from mheon/fix_remote_createcommand
Fix container and pod create commands for remote create
Diffstat (limited to 'pkg/specgen/generate/pod_create.go')
| -rw-r--r-- | pkg/specgen/generate/pod_create.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 690651a23..4fe1b6435 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -93,7 +93,9 @@ func createPodOptions(p *specgen.PodSpecGenerator) ([]libpod.PodCreateOption, er options = append(options, libpod.WithInfraContainerPorts(ports)) } options = append(options, libpod.WithPodCgroups()) - options = append(options, libpod.WithPodCreateCommand()) + if p.PodCreateCommand != nil { + options = append(options, libpod.WithPodCreateCommand(p.PodCreateCommand)) + } if len(p.InfraConmonPidFile) > 0 { options = append(options, libpod.WithInfraConmonPidFile(p.InfraConmonPidFile)) } |