Merge pull request #718 from sjdaws/test-additional-headers

Fix non-multiarch OCI images, reduce GET calls
pull/721/head
Karolis Rusenas 2023-04-15 18:28:02 +01:00 committed by GitHub
commit 70c1b892ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions

View File

@ -20,17 +20,10 @@ func (r *Registry) ManifestDigest(repository, reference string) (digest.Digest,
return "", err
}
req.Header.Set("Accept", manifestv2.MediaTypeManifest)
req.Header.Set("Accept", strings.Join([]string{manifestv2.MediaTypeManifest, oci.MediaTypeImageIndex, oci.MediaTypeImageManifest}, ","))
resp, err := r.Client.Do(req)
if err != nil {
// Try OCI headers if error relates to OCI
if strings.Contains(err.Error(), "OCI index found, but accept header does not support OCI indexes") {
req.Header.Set("Accept", oci.MediaTypeImageIndex)
resp, err = r.Client.Do(req)
}
if err != nil {
return "", err
}
return "", err
}
defer resp.Body.Close()