Fix ACI conversion and add a registry test for it

This commit is contained in:
Joseph Schorr 2018-09-13 14:12:23 -04:00
parent a4f1475de4
commit 3bd1b21ca9
4 changed files with 74 additions and 7 deletions

View file

@ -1,5 +1,6 @@
import logging
import hashlib
import json
import logging
from flask import redirect, Blueprint, abort, send_file, make_response, request
@ -350,7 +351,14 @@ def _repo_verb(namespace, repository, tag_name, verb, formatter, sign=False, che
def os_arch_checker(os, arch):
def checker(tag, manifest):
image_json = manifest.leaf_layer.v1_metadata
try:
image_json = json.loads(manifest.get_parsed_manifest().leaf_layer.raw_v1_metadata)
except ValueError:
logger.exception('Could not parse leaf layer JSON for manifest %s', manifest)
return False
except TypeError:
logger.exception('Could not parse leaf layer JSON for manifest %s', manifest)
return False
# Verify the architecture and os.
operating_system = image_json.get('os', 'linux')