Support pulling of schema2 manifests directly via a manifest list tag
This change ensures that if a manifest list is requested with an accepts header for a *schema 2* manifest, the legacy manifest (if any) is returned as schema 2 if it was pushed as a schema 2 manifest (rather than being auto-converted to schema 1)
This commit is contained in:
parent
a35982f2be
commit
3c2e050593
14 changed files with 215 additions and 15 deletions
|
@ -23,7 +23,7 @@ from data.registry_model.datatypes import RepositoryReference
|
|||
from data.registry_model.blobuploader import upload_blob, BlobUploadSettings
|
||||
from data.registry_model.modelsplitter import SplitModel
|
||||
from image.docker.types import ManifestImageLayer
|
||||
from image.docker.schema1 import DockerSchema1ManifestBuilder
|
||||
from image.docker.schema1 import DockerSchema1ManifestBuilder, DOCKER_SCHEMA1_CONTENT_TYPES
|
||||
from image.docker.schema2.manifest import DockerSchema2ManifestBuilder
|
||||
|
||||
from test.fixtures import *
|
||||
|
@ -780,6 +780,18 @@ def test_get_schema1_parsed_manifest(registry_model):
|
|||
assert registry_model.get_schema1_parsed_manifest(manifest, '', '', '', storage)
|
||||
|
||||
|
||||
def test_convert_manifest(registry_model):
|
||||
repository_ref = registry_model.lookup_repository('devtable', 'simple')
|
||||
latest_tag = registry_model.get_repo_tag(repository_ref, 'latest', include_legacy_image=True)
|
||||
manifest = registry_model.get_manifest_for_tag(latest_tag)
|
||||
|
||||
mediatypes = DOCKER_SCHEMA1_CONTENT_TYPES
|
||||
assert registry_model.convert_manifest(manifest, '', '', '', mediatypes, storage)
|
||||
|
||||
mediatypes = []
|
||||
assert registry_model.convert_manifest(manifest, '', '', '', mediatypes, storage) is None
|
||||
|
||||
|
||||
def test_create_manifest_and_retarget_tag_with_labels(registry_model):
|
||||
repository_ref = registry_model.lookup_repository('devtable', 'simple')
|
||||
latest_tag = registry_model.get_repo_tag(repository_ref, 'latest', include_legacy_image=True)
|
||||
|
|
Reference in a new issue