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/domain/infra | |
| 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/domain/infra')
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index f9b8106ef..26c9c7e2e 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -227,23 +227,6 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo // TODO flag to set CNI plugins dir? - // TODO I don't think these belong here? - // Will follow up with a different PR to address - // - // Pod create options - - infraImageFlag := fs.Lookup("infra-image") - if infraImageFlag != nil && infraImageFlag.Changed { - infraImage, _ := fs.GetString("infra-image") - options = append(options, libpod.WithDefaultInfraImage(infraImage)) - } - - infraCommandFlag := fs.Lookup("infra-command") - if infraCommandFlag != nil && infraImageFlag.Changed { - infraCommand, _ := fs.GetString("infra-command") - options = append(options, libpod.WithDefaultInfraCommand(infraCommand)) - } - if !opts.withFDS { options = append(options, libpod.WithEnableSDNotify()) } |