diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-24 05:40:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 05:40:08 -0400 |
| commit | 3ee967bd5da30ddbd3a8625b00bb82f903641800 (patch) | |
| tree | 5a85a915899aa3dee6d5d34ab6ec9538a312a8a0 /pkg/specgen/generate/container_create.go | |
| parent | 7d8f111245b8f6500890f21116c43d65985c31cc (diff) | |
| parent | 6f769bc0e9879e981fc4b8bc0d474b7ad4049431 (diff) | |
| download | podman-3ee967bd5da30ddbd3a8625b00bb82f903641800.tar.gz podman-3ee967bd5da30ddbd3a8625b00bb82f903641800.tar.bz2 podman-3ee967bd5da30ddbd3a8625b00bb82f903641800.zip | |
Merge pull request #10763 from vrothberg/3.2-backports
3.2 backports
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 7682367b7..e53032ebe 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -92,7 +92,8 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener options = append(options, libpod.WithRootFS(s.Rootfs)) } else { var resolvedImageName string - newImage, resolvedImageName, err = rt.LibimageRuntime().LookupImage(s.Image, nil) + lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true} + newImage, resolvedImageName, err = rt.LibimageRuntime().LookupImage(s.Image, lookupOptions) if err != nil { return nil, err } |