diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-16 11:12:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 11:12:44 -0400 |
| commit | 68585b01687ca695c010cae84999302d816ec304 (patch) | |
| tree | ec72efcb93835d84cb970e1089fc336cd9cf2f76 /pkg/specgen/generate | |
| parent | bc268666356faeb4a2dfb1d19cf507bbf682ccc7 (diff) | |
| parent | e1ac0c303342f47dd06f861e312c2e4d10136df3 (diff) | |
| download | podman-68585b01687ca695c010cae84999302d816ec304.tar.gz podman-68585b01687ca695c010cae84999302d816ec304.tar.bz2 podman-68585b01687ca695c010cae84999302d816ec304.zip | |
Merge pull request #10848 from vrothberg/update-libimage
vendor containers/common@main
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/container.go | 3 | ||||
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index ca92f558d..1f6d00eb7 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -26,8 +26,7 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat var inspectData *libimage.ImageData var err error if s.Image != "" { - lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true} - newImage, _, err = r.LibimageRuntime().LookupImage(s.Image, lookupOptions) + newImage, _, err = r.LibimageRuntime().LookupImage(s.Image, nil) if err != nil { return nil, err } diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index e2901f0b6..b569f8390 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -92,8 +92,7 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener options = append(options, libpod.WithRootFS(s.Rootfs)) } else { var resolvedImageName string - lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true} - newImage, resolvedImageName, err = rt.LibimageRuntime().LookupImage(s.Image, lookupOptions) + newImage, resolvedImageName, err = rt.LibimageRuntime().LookupImage(s.Image, nil) if err != nil { return nil, err } |