vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Merge pull request #2844 from coreos-inc/alegrand/use_latest_appr_server_code"

Browse source 
This reverts commit 646fafb2fd, reversing
changes made to 5c1b635439.
This commit is contained in:
Jimmy Zelinskie 2017-08-09 20:45:46 -04:00
parent 49df658e20
commit 9e09612851
16 changed files with 68 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

7
data/oci_model/release.py
View file

@ -1,7 +1,7 @@
import bisect
from appr.exception import PackageAlreadyExists
from appr.models.package_base import manifest_media_type
from cnr.exception import PackageAlreadyExists
from cnr.models.package_base import manifest_media_type
from data.database import (db_transaction, get_epoch_timestamp, Manifest, ManifestList, Tag,
ManifestListManifest, Blob, ManifestBlob)
@ -10,7 +10,6 @@ from data.oci_model import (blob as blob_model, manifest as manifest_model,
tag as tag_model)
# @TODO(ant31): cnr for retro-compat prepare a data migration
LIST_MEDIA_TYPE = 'application/vnd.cnr.manifest.list.v0.json'
SCHEMA_VERSION = 'v0'
@ -104,7 +103,7 @@ def create_app_release(repo, tag_name, manifest_data, digest, force=False):
list_json.insert(insert_point, manifest.manifest_json)
list_manifest_ids.insert(insert_point, manifest.id)
manifestlist = manifest_list_model.get_or_create_manifest_list(list_json, LIST_MEDIA_TYPE,
SCHEMA_VERSION)
SCHEMA_VERSION)
manifest_list_model.create_manifestlistmanifest(manifestlist, list_manifest_ids, list_json)
tag = tag_model.create_or_update_tag(repo, tag_name, manifest_list=manifestlist,