Skip to content

manifest add: prefer lists when looking up for --all #6421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

manifest add: prefer lists when looking up for --all #6421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmd/buildah/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"strings"
"time"

iutil "github.com/containers/buildah/internal/util"
"github.com/containers/buildah/pkg/cli"
"github.com/containers/buildah/pkg/parse"
"github.com/containers/buildah/util"
Expand Down Expand Up @@ -400,15 +401,14 @@ func manifestCreateCmd(c *cobra.Command, args []string, opts manifestCreateOpts)
if err != nil {
if ref, err = alltransports.ParseImageName(util.DefaultTransport + imageSpec); err != nil {
// check if the local image exists
if ref, _, err = util.FindImage(store, "", systemContext, imageSpec); err != nil {
if _, ref, err = iutil.LookupImage(systemContext, store, imageSpec, opts.all); err != nil {
return err
}
}
}
refLocal, _, err := util.FindImage(store, "", systemContext, imageSpec)
if err == nil {
if _, storageRef, err := iutil.LookupImage(systemContext, store, imageSpec, opts.all); err == nil {
// Found local image so use that.
ref = refLocal
ref = storageRef
}
if _, err = list.Add(getContext(), systemContext, ref, opts.all); err != nil {
return err
Expand Down Expand Up @@ -553,7 +553,7 @@ func manifestAddCmd(c *cobra.Command, args []string, opts manifestAddOpts) error
var ref types.ImageReference
if ref, err = alltransports.ParseImageName(imageSpec); err != nil {
if ref, err = alltransports.ParseImageName(util.DefaultTransport + imageSpec); err != nil {
if ref, _, err = util.FindImage(store, "", systemContext, imageSpec); err != nil {
if _, ref, err = iutil.LookupImage(systemContext, store, imageSpec, opts.all); err != nil {
return err
}
}
Expand All @@ -564,7 +564,7 @@ func manifestAddCmd(c *cobra.Command, args []string, opts manifestAddOpts) error
var storeErr error
// Retry without a custom system context. A user may want to add
// a custom platform (see #3511).
if ref, _, storeErr = util.FindImage(store, "", nil, imageSpec); storeErr != nil {
if _, ref, storeErr = iutil.LookupImage(nil, store, imageSpec, opts.all); storeErr != nil {
logrus.Errorf("Error while trying to find image on local storage: %v", storeErr)
return err
}
Expand Down
20 changes: 14 additions & 6 deletions internal/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,29 @@ import (
"go.podman.io/storage/pkg/unshare"
)

// LookupImage returns *Image to corresponding imagename or id
func LookupImage(ctx *types.SystemContext, store storage.Store, image string) (*libimage.Image, error) {
// LookupImage returns the *libimage.Image and an ImageReference for a local image record with the
// corresponding image name or ID. Wraps libimage.Runtime.LookupImage() to do most of the work.
func LookupImage(ctx *types.SystemContext, store storage.Store, image string, preferList bool) (*libimage.Image, types.ImageReference, error) {
systemContext := ctx
if systemContext == nil {
systemContext = &types.SystemContext{}
}
runtime, err := libimage.RuntimeFromStore(store, &libimage.RuntimeOptions{SystemContext: systemContext})
if err != nil {
return nil, err
return nil, nil, err
}
localImage, _, err := runtime.LookupImage(image, nil)
options := &libimage.LookupImageOptions{
ManifestList: preferList,
}
localImage, _, err := runtime.LookupImage(image, options)
if err != nil {
return nil, nil, err
}
storageRef, err := localImage.StorageReference()
if err != nil {
return nil, err
return nil, nil, err
}
return localImage, nil
return localImage, storageRef, nil
}

// NormalizePlatform validates and translate the platform to the canonical value.
Expand Down
4 changes: 2 additions & 2 deletions internal/volumes/volumes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func GetBindMount(sys *types.SystemContext, args []string, contextDir string, st
// if mountPoint of image was not found in additionalMap
// or additionalMap was nil, try mounting image
if mountPoint == "" {
image, err := internalUtil.LookupImage(sys, store, fromWhere)
image, _, err := internalUtil.LookupImage(sys, store, fromWhere, false)
if err != nil {
return newMount, "", "", "", err
}
Expand Down Expand Up @@ -515,7 +515,7 @@ func GetCacheMount(sys *types.SystemContext, args []string, store storage.Store,
// it's not an additional build context, stage, or
// already-mounted image, but it might still be an image
if mountPoint == "" {
image, err := internalUtil.LookupImage(sys, store, fromWhere)
image, _, err := internalUtil.LookupImage(sys, store, fromWhere, false)
if err != nil {
return newMount, "", "", "", nil, err
}
Expand Down
8 changes: 8 additions & 0 deletions tests/lists.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ IMAGE_LIST_S390X_INSTANCE_DIGEST=sha256:882a20ee0df7399a445285361d38b711c299ca09
expect_output --substring ${IMAGE_LIST_ARM64_INSTANCE_DIGEST}
expect_output --substring ${IMAGE_LIST_PPC64LE_INSTANCE_DIGEST}
expect_output --substring ${IMAGE_LIST_S390X_INSTANCE_DIGEST}
run_buildah manifest create foo2
run_buildah manifest add --all foo2 foo
run_buildah manifest inspect foo2
expect_output --substring ${IMAGE_LIST_AMD64_INSTANCE_DIGEST}
expect_output --substring ${IMAGE_LIST_ARM_INSTANCE_DIGEST}
expect_output --substring ${IMAGE_LIST_ARM64_INSTANCE_DIGEST}
expect_output --substring ${IMAGE_LIST_PPC64LE_INSTANCE_DIGEST}
expect_output --substring ${IMAGE_LIST_S390X_INSTANCE_DIGEST}
}

@test "manifest-annotate global annotation" {
Expand Down
12 changes: 2 additions & 10 deletions util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"syscall"

"github.com/containers/buildah/define"
"github.com/containers/buildah/internal/util"
"github.com/docker/distribution/registry/api/errcode"
"github.com/opencontainers/go-digest"
specs "github.com/opencontainers/runtime-spec/specs-go"
Expand Down Expand Up @@ -140,16 +141,7 @@ func ExpandNames(names []string, systemContext *types.SystemContext, store stora
// name. Please note that the second argument has been deprecated and has no
// effect anymore.
func FindImage(store storage.Store, _ string, systemContext *types.SystemContext, image string) (types.ImageReference, *storage.Image, error) {
runtime, err := libimage.RuntimeFromStore(store, &libimage.RuntimeOptions{SystemContext: systemContext})
if err != nil {
return nil, nil, err
}

localImage, _, err := runtime.LookupImage(image, nil)
if err != nil {
return nil, nil, err
}
ref, err := localImage.StorageReference()
localImage, ref, err := util.LookupImage(systemContext, store, image, false)
if err != nil {
return nil, nil, err
}
Expand Down