diff --git a/pkg/app/rm.go b/pkg/app/rm.go index dd8f370..7e492f6 100644 --- a/pkg/app/rm.go +++ b/pkg/app/rm.go @@ -188,7 +188,7 @@ func (c *PolicyApp) tarballReferencedByOtherManifests(ociClient *oci.Oci, ref *o return false, err } for _, layer := range manifest.Layers { - if layer.MediaType == ocispec.MediaTypeImageLayerGzip && layer.Digest == ref.Digest { + if (layer.MediaType == ocispec.MediaTypeImageLayerGzip || layer.MediaType == ocispec.MediaTypeImageLayer) && layer.Digest == ref.Digest { return true, nil } } diff --git a/pkg/oci/oci.go b/pkg/oci/oci.go index 719cee4..631e788 100644 --- a/pkg/oci/oci.go +++ b/pkg/oci/oci.go @@ -302,7 +302,7 @@ func (o *Oci) GetTarballAndConfigLayerDescriptor(ctx context.Context, descriptor } for _, layer := range manifest.Layers { - if layer.MediaType == ocispec.MediaTypeImageLayerGzip { + if layer.MediaType == ocispec.MediaTypeImageLayerGzip || layer.MediaType == ocispec.MediaTypeImageLayer { tarballDescriptor, err := o.ociStore.Resolve(ctx, layer.Digest.String()) if err != nil { return nil, nil, err @@ -310,7 +310,7 @@ func (o *Oci) GetTarballAndConfigLayerDescriptor(ctx context.Context, descriptor return &tarballDescriptor, &configDescriptor, nil } } - return nil, nil, nil + return nil, nil, errors.New("could not find tarball and config descriptors") } func (o *Oci) GetManifest(descriptor *ocispec.Descriptor) (*ocispec.Manifest, error) {