root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix inspect/tag-by-truncated-image-ID 

Teach inspect and tag about image IDs, truncated and otherwise.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Closes: #138
Approved by: rhatdan
This commit is contained in:
Nalin Dahyabhai 2017-06-07 09:39:33 -04:00 committed by Atomic Bot
parent 7e042a9308
commit c11936323a
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
import.go
View File

@ -5,6 +5,7 @@ import (
"github.com/containers/image/types" "github.com/containers/image/types"
"github.com/containers/storage" "github.com/containers/storage"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/projectatomic/buildah/util"
) )
func importBuilderDataFromImage(store storage.Store, systemContext *types.SystemContext, imageID, containerName, containerID string) (*Builder, error) { func importBuilderDataFromImage(store storage.Store, systemContext *types.SystemContext, imageID, containerName, containerID string) (*Builder, error) {
@ -85,20 +86,16 @@ func importBuilderFromImage(store storage.Store, options ImportFromImageOptions)
return nil, errors.Errorf("image name must be specified") return nil, errors.Errorf("image name must be specified")
} }
ref, err := is.Transport.ParseStoreReference(store, options.Image) img, err := util.FindImage(store, options.Image)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error parsing reference to image %q", options.Image) return nil, errors.Wrapf(err, "error locating image %q for importing settings", options.Image)
}
img, err := is.Transport.GetStoreImage(store, ref)
if err != nil {
return nil, errors.Wrapf(err, "unable to locate image")
} }
systemContext := getSystemContext(options.SignaturePolicyPath) systemContext := getSystemContext(options.SignaturePolicyPath)
builder, err := importBuilderDataFromImage(store, systemContext, img.ID, "", "") builder, err := importBuilderDataFromImage(store, systemContext, img.ID, "", "")
if err != nil { if err != nil {
return nil, err return nil, errors.Wrapf(err, "error importing build settings from image %q", options.Image)
} }
return builder, nil return builder, nil

15
util/util.go
View File

@ -28,13 +28,20 @@ func ExpandTags(tags []string) ([]string, error) {
// FindImage locates the locally-stored image which corresponds to a given name. // FindImage locates the locally-stored image which corresponds to a given name.
func FindImage(store storage.Store, image string) (*storage.Image, error) { func FindImage(store storage.Store, image string) (*storage.Image, error) {
var img *storage.Image
ref, err := is.Transport.ParseStoreReference(store, image) ref, err := is.Transport.ParseStoreReference(store, image)
if err != nil { if err == nil {
return nil, errors.Wrapf(err, "error parsing reference to image %q", image) img, err = is.Transport.GetStoreImage(store, ref)
} }
img, err := is.Transport.GetStoreImage(store, ref)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "unable to locate image") img2, err2 := store.Image(image)
if err2 != nil {
if ref == nil {
return nil, errors.Wrapf(err, "error parsing reference to image %q", image)
}
return nil, errors.Wrapf(err, "unable to locate image %q", image)
}
img = img2
} }
return img, nil return img, nil
} }