diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-01-28 06:24:01 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-01-31 17:21:25 -0500 |
| commit | 6609bb73aae2185571ff7e793dfa268f04643874 (patch) | |
| tree | 0bbb6d4be98e09119746fcb5d3d585212ee8add0 /pkg/specgen/generate | |
| parent | 271867263c334460ee404cc5059a9453e47171f7 (diff) | |
| download | podman-6609bb73aae2185571ff7e793dfa268f04643874.tar.gz podman-6609bb73aae2185571ff7e793dfa268f04643874.tar.bz2 podman-6609bb73aae2185571ff7e793dfa268f04643874.zip | |
Fix use of infra image to clarify default
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/pod_create.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 369ebda58..03829e8cf 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -82,7 +82,7 @@ func pullOrBuildInfraImage(p *entities.PodSpec, rt *libpod.Runtime) error { imageName = rtConfig.Engine.InfraImage } - if imageName != config.DefaultInfraImage { + if imageName != "" { _, err := rt.LibimageRuntime().Pull(context.Background(), imageName, config.PullPolicyMissing, nil) if err != nil { return err @@ -278,8 +278,6 @@ func MapSpec(p *specgen.PodSpecGenerator) (*specgen.SpecGenerator, error) { p.InfraContainerSpec.ConmonPidFile = p.InfraConmonPidFile } - if p.InfraImage != config.DefaultInfraImage { - p.InfraContainerSpec.Image = p.InfraImage - } + p.InfraContainerSpec.Image = p.InfraImage return p.InfraContainerSpec, nil } |