mirror of
https://github.com/goharbor/harbor.git
synced 2024-12-24 09:38:09 +01:00
Remove the workaround for blocking manifest list in replication
Remove the workaround for blocking manifest list in replication Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
parent
6571135cbf
commit
0c776076bd
@ -16,7 +16,6 @@ package image
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/distribution/manifest/manifestlist"
|
"github.com/docker/distribution/manifest/manifestlist"
|
||||||
@ -259,6 +258,7 @@ func (t *transfer) pullManifest(repository, reference string) (
|
|||||||
return nil, "", nil
|
return nil, "", nil
|
||||||
}
|
}
|
||||||
t.logger.Infof("pulling the manifest of image %s:%s ...", repository, reference)
|
t.logger.Infof("pulling the manifest of image %s:%s ...", repository, reference)
|
||||||
|
// TODO add OCI media types
|
||||||
manifest, digest, err := t.src.PullManifest(repository, reference, []string{
|
manifest, digest, err := t.src.PullManifest(repository, reference, []string{
|
||||||
schema1.MediaTypeManifest,
|
schema1.MediaTypeManifest,
|
||||||
schema1.MediaTypeSignedManifest,
|
schema1.MediaTypeSignedManifest,
|
||||||
@ -271,48 +271,8 @@ func (t *transfer) pullManifest(repository, reference string) (
|
|||||||
}
|
}
|
||||||
t.logger.Infof("the manifest of image %s:%s pulled", repository, reference)
|
t.logger.Infof("the manifest of image %s:%s pulled", repository, reference)
|
||||||
|
|
||||||
// this is a solution to work around that harbor doesn't support manifest list
|
|
||||||
return t.handleManifest(manifest, repository, digest)
|
|
||||||
}
|
|
||||||
|
|
||||||
// if the media type of the specified manifest is manifest list, just abstract one
|
|
||||||
// manifest from the list and return it
|
|
||||||
func (t *transfer) handleManifest(manifest distribution.Manifest, repository, digest string) (
|
|
||||||
distribution.Manifest, string, error) {
|
|
||||||
mediaType, _, err := manifest.Payload()
|
|
||||||
if err != nil {
|
|
||||||
t.logger.Errorf("failed to call the payload method for manifest of %s:%s: %v", repository, digest, err)
|
|
||||||
return nil, "", err
|
|
||||||
}
|
|
||||||
// manifest
|
|
||||||
if mediaType == schema1.MediaTypeManifest ||
|
|
||||||
mediaType == schema1.MediaTypeSignedManifest ||
|
|
||||||
mediaType == schema2.MediaTypeManifest {
|
|
||||||
return manifest, digest, nil
|
return manifest, digest, nil
|
||||||
}
|
}
|
||||||
// manifest list
|
|
||||||
t.logger.Info("trying abstract a manifest from the manifest list...")
|
|
||||||
manifestlist, ok := manifest.(*manifestlist.DeserializedManifestList)
|
|
||||||
if !ok {
|
|
||||||
err := fmt.Errorf("the object isn't a DeserializedManifestList")
|
|
||||||
t.logger.Errorf(err.Error())
|
|
||||||
return nil, "", err
|
|
||||||
}
|
|
||||||
digest = ""
|
|
||||||
for _, reference := range manifestlist.Manifests {
|
|
||||||
if strings.ToLower(reference.Platform.Architecture) == "amd64" &&
|
|
||||||
strings.ToLower(reference.Platform.OS) == "linux" {
|
|
||||||
digest = reference.Digest.String()
|
|
||||||
t.logger.Infof("a manifest(architecture: amd64, os: linux) found, using this one: %s", digest)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(digest) == 0 {
|
|
||||||
digest = manifest.References()[0].Digest.String()
|
|
||||||
t.logger.Infof("no manifest(architecture: amd64, os: linux) found, using the first one: %s", digest)
|
|
||||||
}
|
|
||||||
return t.pullManifest(repository, digest)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *transfer) exist(repository, tag string) (bool, string, error) {
|
func (t *transfer) exist(repository, tag string) (bool, string, error) {
|
||||||
exist, digest, err := t.dst.ManifestExist(repository, tag)
|
exist, digest, err := t.dst.ManifestExist(repository, tag)
|
||||||
|
Loading…
Reference in New Issue
Block a user