mirror of
https://github.com/containers/podman.git
synced 2025-12-08 06:39:05 +08:00
migrate Podman to containers/common/libimage
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
402
vendor/github.com/containers/common/pkg/supplemented/supplemented.go
generated
vendored
Normal file
402
vendor/github.com/containers/common/pkg/supplemented/supplemented.go
generated
vendored
Normal file
@@ -0,0 +1,402 @@
|
||||
package supplemented
|
||||
|
||||
import (
|
||||
"container/list"
|
||||
"context"
|
||||
"io"
|
||||
|
||||
cp "github.com/containers/image/v5/copy"
|
||||
"github.com/containers/image/v5/image"
|
||||
"github.com/containers/image/v5/manifest"
|
||||
"github.com/containers/image/v5/transports"
|
||||
"github.com/containers/image/v5/types"
|
||||
multierror "github.com/hashicorp/go-multierror"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// supplementedImageReference groups multiple references together.
|
||||
type supplementedImageReference struct {
|
||||
types.ImageReference
|
||||
references []types.ImageReference
|
||||
multiple cp.ImageListSelection
|
||||
instances []digest.Digest
|
||||
}
|
||||
|
||||
// supplementedImageSource represents an image, plus all of the blobs of other images.
|
||||
type supplementedImageSource struct {
|
||||
types.ImageSource
|
||||
reference types.ImageReference
|
||||
manifest []byte // The manifest list or image index.
|
||||
manifestType string // The MIME type of the manifest list or image index.
|
||||
sourceDefaultInstances map[types.ImageSource]digest.Digest // The default manifest instances of open ImageSource objects.
|
||||
sourceInstancesByInstance map[digest.Digest]types.ImageSource // A map from manifest instance digests to open ImageSource objects.
|
||||
instancesByBlobDigest map[digest.Digest]digest.Digest // A map from blob digests to manifest instance digests.
|
||||
}
|
||||
|
||||
// Reference groups one reference and some number of additional references
|
||||
// together as a group. The first reference's default instance will be treated
|
||||
// as the default instance of the resulting reference, with the other
|
||||
// references' instances made available as instances for their respective
|
||||
// digests.
|
||||
func Reference(ref types.ImageReference, supplemental []types.ImageReference, multiple cp.ImageListSelection, instances []digest.Digest) types.ImageReference {
|
||||
if len(instances) > 0 {
|
||||
i := make([]digest.Digest, len(instances))
|
||||
copy(i, instances)
|
||||
instances = i
|
||||
}
|
||||
return &supplementedImageReference{
|
||||
ImageReference: ref,
|
||||
references: append([]types.ImageReference{}, supplemental...),
|
||||
multiple: multiple,
|
||||
instances: instances,
|
||||
}
|
||||
}
|
||||
|
||||
// NewImage returns a new higher-level view of the image.
|
||||
func (s *supplementedImageReference) NewImage(ctx context.Context, sys *types.SystemContext) (types.ImageCloser, error) {
|
||||
src, err := s.NewImageSource(ctx, sys)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "error building a new Image using an ImageSource")
|
||||
}
|
||||
return image.FromSource(ctx, sys, src)
|
||||
}
|
||||
|
||||
// NewImageSource opens the referenced images, scans their manifests for
|
||||
// instances, and builds mappings from each blob mentioned in them to their
|
||||
// instances.
|
||||
func (s *supplementedImageReference) NewImageSource(ctx context.Context, sys *types.SystemContext) (iss types.ImageSource, err error) {
|
||||
sources := make(map[digest.Digest]types.ImageSource)
|
||||
defaultInstances := make(map[types.ImageSource]digest.Digest)
|
||||
instances := make(map[digest.Digest]digest.Digest)
|
||||
var sis *supplementedImageSource
|
||||
|
||||
// Open the default instance for reading.
|
||||
top, err := s.ImageReference.NewImageSource(ctx, sys)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "error opening %q as image source", transports.ImageName(s.ImageReference))
|
||||
}
|
||||
|
||||
defer func() {
|
||||
if err != nil {
|
||||
if iss != nil {
|
||||
// The composite source has been created. Use its Close method.
|
||||
if err2 := iss.Close(); err2 != nil {
|
||||
logrus.Errorf("error opening image: %v", err2)
|
||||
}
|
||||
} else if top != nil {
|
||||
// The composite source has not been created, but the top was already opened. Close it.
|
||||
if err2 := top.Close(); err2 != nil {
|
||||
logrus.Errorf("error opening image: %v", err2)
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
var addSingle, addMulti func(manifestBytes []byte, manifestType string, src types.ImageSource) error
|
||||
type manifestToRead struct {
|
||||
src types.ImageSource
|
||||
instance *digest.Digest
|
||||
}
|
||||
manifestsToRead := list.New()
|
||||
|
||||
addSingle = func(manifestBytes []byte, manifestType string, src types.ImageSource) error {
|
||||
// Mark this instance as being associated with this ImageSource.
|
||||
manifestDigest, err := manifest.Digest(manifestBytes)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error computing digest over manifest %q", string(manifestBytes))
|
||||
}
|
||||
sources[manifestDigest] = src
|
||||
|
||||
// Parse the manifest as a single image.
|
||||
man, err := manifest.FromBlob(manifestBytes, manifestType)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error parsing manifest %q", string(manifestBytes))
|
||||
}
|
||||
|
||||
// Log the config blob's digest and the blobs of its layers as associated with this manifest.
|
||||
config := man.ConfigInfo()
|
||||
if config.Digest != "" {
|
||||
instances[config.Digest] = manifestDigest
|
||||
logrus.Debugf("blob %q belongs to %q", config.Digest, manifestDigest)
|
||||
}
|
||||
|
||||
layers := man.LayerInfos()
|
||||
for _, layer := range layers {
|
||||
instances[layer.Digest] = manifestDigest
|
||||
logrus.Debugf("layer %q belongs to %q", layer.Digest, manifestDigest)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
addMulti = func(manifestBytes []byte, manifestType string, src types.ImageSource) error {
|
||||
// Mark this instance as being associated with this ImageSource.
|
||||
manifestDigest, err := manifest.Digest(manifestBytes)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error computing manifest digest")
|
||||
}
|
||||
sources[manifestDigest] = src
|
||||
|
||||
// Parse the manifest as a list of images.
|
||||
list, err := manifest.ListFromBlob(manifestBytes, manifestType)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error parsing manifest blob %q as a %q", string(manifestBytes), manifestType)
|
||||
}
|
||||
|
||||
// Figure out which of its instances we want to look at.
|
||||
var chaseInstances []digest.Digest
|
||||
switch s.multiple {
|
||||
case cp.CopySystemImage:
|
||||
instance, err := list.ChooseInstance(sys)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error selecting appropriate instance from list")
|
||||
}
|
||||
chaseInstances = []digest.Digest{instance}
|
||||
case cp.CopySpecificImages:
|
||||
chaseInstances = s.instances
|
||||
case cp.CopyAllImages:
|
||||
chaseInstances = list.Instances()
|
||||
}
|
||||
|
||||
// Queue these manifest instances for reading from this
|
||||
// ImageSource later, if we don't stumble across them somewhere
|
||||
// else first.
|
||||
for _, instanceIterator := range chaseInstances {
|
||||
instance := instanceIterator
|
||||
next := &manifestToRead{
|
||||
src: src,
|
||||
instance: &instance,
|
||||
}
|
||||
if src == top {
|
||||
// Prefer any other source.
|
||||
manifestsToRead.PushBack(next)
|
||||
} else {
|
||||
// Prefer this source over the first ("main") one.
|
||||
manifestsToRead.PushFront(next)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
visitedReferences := make(map[types.ImageReference]struct{})
|
||||
for i, ref := range append([]types.ImageReference{s.ImageReference}, s.references...) {
|
||||
if _, visited := visitedReferences[ref]; visited {
|
||||
continue
|
||||
}
|
||||
visitedReferences[ref] = struct{}{}
|
||||
|
||||
// Open this image for reading.
|
||||
var src types.ImageSource
|
||||
if ref == s.ImageReference {
|
||||
src = top
|
||||
} else {
|
||||
src, err = ref.NewImageSource(ctx, sys)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "error opening %q as image source", transports.ImageName(ref))
|
||||
}
|
||||
}
|
||||
|
||||
// Read the default manifest for the image.
|
||||
manifestBytes, manifestType, err := src.GetManifest(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "error reading default manifest from image %q", transports.ImageName(ref))
|
||||
}
|
||||
|
||||
// If this is the first image, mark it as our starting point.
|
||||
if i == 0 {
|
||||
sources[""] = src
|
||||
|
||||
sis = &supplementedImageSource{
|
||||
ImageSource: top,
|
||||
reference: s,
|
||||
manifest: manifestBytes,
|
||||
manifestType: manifestType,
|
||||
sourceDefaultInstances: defaultInstances,
|
||||
sourceInstancesByInstance: sources,
|
||||
instancesByBlobDigest: instances,
|
||||
}
|
||||
iss = sis
|
||||
}
|
||||
|
||||
// Record the digest of the ImageSource's default instance's manifest.
|
||||
manifestDigest, err := manifest.Digest(manifestBytes)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "error computing digest of manifest from image %q", transports.ImageName(ref))
|
||||
}
|
||||
sis.sourceDefaultInstances[src] = manifestDigest
|
||||
|
||||
// If the ImageSource's default manifest is a list, parse each of its instances.
|
||||
if manifest.MIMETypeIsMultiImage(manifestType) {
|
||||
if err = addMulti(manifestBytes, manifestType, src); err != nil {
|
||||
return nil, errors.Wrapf(err, "error adding multi-image %q", transports.ImageName(ref))
|
||||
}
|
||||
} else {
|
||||
if err = addSingle(manifestBytes, manifestType, src); err != nil {
|
||||
return nil, errors.Wrapf(err, "error adding single image %q", transports.ImageName(ref))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Parse the rest of the instances.
|
||||
for manifestsToRead.Front() != nil {
|
||||
front := manifestsToRead.Front()
|
||||
value := front.Value
|
||||
manifestToRead, ok := value.(*manifestToRead)
|
||||
if !ok {
|
||||
panic("bug: wrong type looking for *manifestToRead in list?")
|
||||
}
|
||||
manifestsToRead.Remove(front)
|
||||
|
||||
// If we already read this manifest, no need to read it again.
|
||||
if _, alreadyRead := sources[*manifestToRead.instance]; alreadyRead {
|
||||
continue
|
||||
}
|
||||
|
||||
// Read the instance's manifest.
|
||||
manifestBytes, manifestType, err := manifestToRead.src.GetManifest(ctx, manifestToRead.instance)
|
||||
if err != nil {
|
||||
// if errors.Cause(err) == storage.ErrImageUnknown || os.IsNotExist(errors.Cause(err)) {
|
||||
// Trust that we either don't need it, or that it's in another reference.
|
||||
// continue
|
||||
// }
|
||||
return nil, errors.Wrapf(err, "error reading manifest for instance %q", manifestToRead.instance)
|
||||
}
|
||||
|
||||
if manifest.MIMETypeIsMultiImage(manifestType) {
|
||||
// Add the list's contents.
|
||||
if err = addMulti(manifestBytes, manifestType, manifestToRead.src); err != nil {
|
||||
return nil, errors.Wrapf(err, "error adding single image instance %q", manifestToRead.instance)
|
||||
}
|
||||
} else {
|
||||
// Add the single image's contents.
|
||||
if err = addSingle(manifestBytes, manifestType, manifestToRead.src); err != nil {
|
||||
return nil, errors.Wrapf(err, "error adding single image instance %q", manifestToRead.instance)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return iss, nil
|
||||
}
|
||||
|
||||
func (s *supplementedImageReference) DeleteImage(ctx context.Context, sys *types.SystemContext) error {
|
||||
return errors.Errorf("deletion of images not implemented")
|
||||
}
|
||||
|
||||
func (s *supplementedImageSource) Close() error {
|
||||
var returnErr *multierror.Error
|
||||
closed := make(map[types.ImageSource]struct{})
|
||||
for _, sourceInstance := range s.sourceInstancesByInstance {
|
||||
if _, closed := closed[sourceInstance]; closed {
|
||||
continue
|
||||
}
|
||||
if err := sourceInstance.Close(); err != nil {
|
||||
returnErr = multierror.Append(returnErr, err)
|
||||
}
|
||||
closed[sourceInstance] = struct{}{}
|
||||
}
|
||||
if returnErr == nil {
|
||||
return nil
|
||||
}
|
||||
return returnErr.ErrorOrNil()
|
||||
}
|
||||
|
||||
func (s *supplementedImageSource) GetManifest(ctx context.Context, instanceDigest *digest.Digest) ([]byte, string, error) {
|
||||
requestInstanceDigest := instanceDigest
|
||||
if instanceDigest == nil {
|
||||
return s.manifest, s.manifestType, nil
|
||||
}
|
||||
if sourceInstance, ok := s.sourceInstancesByInstance[*instanceDigest]; ok {
|
||||
if *instanceDigest == s.sourceDefaultInstances[sourceInstance] {
|
||||
requestInstanceDigest = nil
|
||||
}
|
||||
return sourceInstance.GetManifest(ctx, requestInstanceDigest)
|
||||
}
|
||||
return nil, "", errors.Wrapf(ErrDigestNotFound, "error getting manifest for digest %q", *instanceDigest)
|
||||
}
|
||||
|
||||
func (s *supplementedImageSource) GetBlob(ctx context.Context, blob types.BlobInfo, bic types.BlobInfoCache) (io.ReadCloser, int64, error) {
|
||||
sourceInstance, ok := s.instancesByBlobDigest[blob.Digest]
|
||||
if !ok {
|
||||
return nil, -1, errors.Wrapf(ErrBlobNotFound, "error blob %q in known instances", blob.Digest)
|
||||
}
|
||||
src, ok := s.sourceInstancesByInstance[sourceInstance]
|
||||
if !ok {
|
||||
return nil, -1, errors.Wrapf(ErrDigestNotFound, "error getting image source for instance %q", sourceInstance)
|
||||
}
|
||||
return src.GetBlob(ctx, blob, bic)
|
||||
}
|
||||
|
||||
func (s *supplementedImageSource) HasThreadSafeGetBlob() bool {
|
||||
checked := make(map[types.ImageSource]struct{})
|
||||
for _, sourceInstance := range s.sourceInstancesByInstance {
|
||||
if _, checked := checked[sourceInstance]; checked {
|
||||
continue
|
||||
}
|
||||
if !sourceInstance.HasThreadSafeGetBlob() {
|
||||
return false
|
||||
}
|
||||
checked[sourceInstance] = struct{}{}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func (s *supplementedImageSource) GetSignatures(ctx context.Context, instanceDigest *digest.Digest) ([][]byte, error) {
|
||||
var (
|
||||
src types.ImageSource
|
||||
digest digest.Digest
|
||||
)
|
||||
requestInstanceDigest := instanceDigest
|
||||
if instanceDigest == nil {
|
||||
if sourceInstance, ok := s.sourceInstancesByInstance[""]; ok {
|
||||
src = sourceInstance
|
||||
}
|
||||
} else {
|
||||
digest = *instanceDigest
|
||||
if sourceInstance, ok := s.sourceInstancesByInstance[*instanceDigest]; ok {
|
||||
src = sourceInstance
|
||||
}
|
||||
if *instanceDigest == s.sourceDefaultInstances[src] {
|
||||
requestInstanceDigest = nil
|
||||
}
|
||||
}
|
||||
if src != nil {
|
||||
return src.GetSignatures(ctx, requestInstanceDigest)
|
||||
}
|
||||
return nil, errors.Wrapf(ErrDigestNotFound, "error finding instance for instance digest %q to read signatures", digest)
|
||||
}
|
||||
|
||||
func (s *supplementedImageSource) LayerInfosForCopy(ctx context.Context, instanceDigest *digest.Digest) ([]types.BlobInfo, error) {
|
||||
var src types.ImageSource
|
||||
requestInstanceDigest := instanceDigest
|
||||
errMsgDigest := ""
|
||||
if instanceDigest == nil {
|
||||
if sourceInstance, ok := s.sourceInstancesByInstance[""]; ok {
|
||||
src = sourceInstance
|
||||
}
|
||||
} else {
|
||||
errMsgDigest = string(*instanceDigest)
|
||||
if sourceInstance, ok := s.sourceInstancesByInstance[*instanceDigest]; ok {
|
||||
src = sourceInstance
|
||||
}
|
||||
if *instanceDigest == s.sourceDefaultInstances[src] {
|
||||
requestInstanceDigest = nil
|
||||
}
|
||||
}
|
||||
if src != nil {
|
||||
blobInfos, err := src.LayerInfosForCopy(ctx, requestInstanceDigest)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "error reading layer infos for copy from instance %q", instanceDigest)
|
||||
}
|
||||
var manifestDigest digest.Digest
|
||||
if instanceDigest != nil {
|
||||
manifestDigest = *instanceDigest
|
||||
}
|
||||
for _, blobInfo := range blobInfos {
|
||||
s.instancesByBlobDigest[blobInfo.Digest] = manifestDigest
|
||||
}
|
||||
return blobInfos, nil
|
||||
}
|
||||
return nil, errors.Wrapf(ErrDigestNotFound, "error finding instance for instance digest %q to copy layers", errMsgDigest)
|
||||
}
|
||||
Reference in New Issue
Block a user