Skip to content

Commit

Permalink
Merge pull request #60 from infosiftr/containerd-helpers
Browse files Browse the repository at this point in the history
Use containerd helper functions I didn't notice before in registry/
  • Loading branch information
tianon authored Dec 1, 2022
2 parents c896b4d + 6d8e83b commit 18db6c5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions registry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,18 @@ func (obj ResolvedObject) Manifest(ctx context.Context) (*ocispec.Manifest, erro

// ConfigBlob assumes the given object is a "config" blob (see [ResolvedObject.At]) and fetches/returns the parsed config object
func (obj ResolvedObject) ConfigBlob(ctx context.Context) (*ocispec.Image, error) {
if obj.Desc.MediaType != "application/vnd.oci.image.config.v1+json" && obj.Desc.MediaType != "application/vnd.docker.container.image.v1+json" {
if !images.IsConfigType(obj.Desc.MediaType) {
return nil, fmt.Errorf("unknown media type: %q", obj.Desc.MediaType)
}
return get[ocispec.Image](ctx, obj)
}

func (obj ResolvedObject) IsImageManifest() bool {
return obj.Desc.MediaType == ocispec.MediaTypeImageManifest || obj.Desc.MediaType == images.MediaTypeDockerSchema2Manifest
return images.IsManifestType(obj.Desc.MediaType)
}

func (obj ResolvedObject) IsImageIndex() bool {
return obj.Desc.MediaType == ocispec.MediaTypeImageIndex || obj.Desc.MediaType == images.MediaTypeDockerSchema2ManifestList
return images.IsIndexType(obj.Desc.MediaType)
}

// Resolve returns an object which can be used to query a registry for manifest objects or certain blobs with type checking helpers
Expand Down

0 comments on commit 18db6c5

Please sign in to comment.