diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-09-13 11:54:08 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-09-16 07:42:19 -0400 |
| commit | b3d6383f25e71748793535733a767c60ccfcbd82 (patch) | |
| tree | 847b11be7a0587ff338ed45232b889ed359df6c1 /pkg/specgen/generate | |
| parent | 0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6 (diff) | |
| download | podman-b3d6383f25e71748793535733a767c60ccfcbd82.tar.gz podman-b3d6383f25e71748793535733a767c60ccfcbd82.tar.bz2 podman-b3d6383f25e71748793535733a767c60ccfcbd82.zip | |
Fix podman pod create --infra-command and --infra-image
Currently infr-command and --infra-image commands are ignored
from the user. This PR instruments them and adds tests for
each combination.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/pod_create.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 0bd39d5a4..101201252 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -84,6 +84,15 @@ func createPodOptions(p *specgen.PodSpecGenerator, rt *libpod.Runtime) ([]libpod if len(p.CNINetworks) > 0 { options = append(options, libpod.WithPodNetworks(p.CNINetworks)) } + + if len(p.InfraImage) > 0 { + options = append(options, libpod.WithInfraImage(p.InfraImage)) + } + + if len(p.InfraCommand) > 0 { + options = append(options, libpod.WithInfraCommand(p.InfraCommand)) + } + switch p.NetNS.NSMode { case specgen.Bridge, specgen.Default, "": logrus.Debugf("Pod using default network mode") |