diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-13 21:57:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 21:57:39 +0200 |
| commit | 0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb (patch) | |
| tree | 6d777c6e7bf9d542633a936a0bb03decceaeaaa8 /pkg/domain/entities | |
| parent | d7695dd957b162ed24c807dc91200fe1abaecff1 (diff) | |
| parent | 90ead05903e9c42758c1052c2ee623dca8de5e98 (diff) | |
| download | podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.tar.gz podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.tar.bz2 podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.zip | |
Merge pull request #5800 from baude/v2edtests
Fixes for load and other system tests
Diffstat (limited to 'pkg/domain/entities')
| -rw-r--r-- | pkg/domain/entities/pods.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index cd2e79961..9ca8ff43c 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -1,6 +1,7 @@ package entities import ( + "strings" "time" "github.com/containers/libpod/libpod" @@ -121,7 +122,9 @@ func (p PodCreateOptions) ToPodSpecGen(s *specgen.PodSpecGenerator) { s.Hostname = p.Hostname s.Labels = p.Labels s.NoInfra = !p.Infra - s.InfraCommand = []string{p.InfraCommand} + if len(p.InfraCommand) > 0 { + s.InfraCommand = strings.Split(p.InfraCommand, " ") + } s.InfraImage = p.InfraImage s.SharedNamespaces = p.Share |