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

Rename Image.image_id to Image.docker_image_id to reduce confusion.

Browse source
This commit is contained in:
yackob03 2013-10-01 14:14:39 -04:00
parent 4746f9c324
commit 96896b9067
7 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

35
data/model.py
View file

@ -182,25 +182,26 @@ def create_repository(namespace, name, owner):
return repo
def create_image(image_id, repository):
new_image = Image.create(image_id=image_id, repository=repository)
def create_image(docker_image_id, repository):
new_image = Image.create(docker_image_id=docker_image_id,
repository=repository)
return new_image
def set_image_checksum(image_id, repository, checksum):
fetched = Image.get(Image.image_id == image_id,
def set_image_checksum(docker_image_id, repository, checksum):
fetched = Image.get(Image.docker_image_id == docker_image_id,
Image.repository == repository)
fetched.checksum = checksum
fetched.save()
return fetched
def set_image_metadata(image_id, namespace_name, repository_name,
def set_image_metadata(docker_image_id, namespace_name, repository_name,
created_date_str, comment, parent=None):
joined = Image.select().join(Repository)
image_list = list(joined.where(Repository.name == repository_name,
Repository.namespace == namespace_name,
Image.image_id == image_id))
Image.docker_image_id == docker_image_id))
if not image_list:
raise DataModelException('No image with specified id and repository')
@ -232,9 +233,9 @@ def list_repository_tags(namespace_name, repository_name):
def get_tag_image(namespace_name, repository_name, tag_name):
joined = Image.select().join(RepositoryTag).join(Repository)
fetched = joined.where(Repository.name == repository_name,
Repository.namespace == namespace_name,
RepositoryTag.name == tag_name)
fetched = list(joined.where(Repository.name == repository_name,
Repository.namespace == namespace_name,
RepositoryTag.name == tag_name))
if not fetched:
raise DataModelException('Unable to find image for tag.')
@ -242,8 +243,16 @@ def get_tag_image(namespace_name, repository_name, tag_name):
return fetched[0]
def get_image_by_id(image_id):
return Image.get(Image.image_id == image_id)
def get_image_by_id(namespace_name, repository_name, docker_image_id):
joined = Image.select().join(Repository)
fetched = list(joined.where(Repository.name == repository_name,
Repository.namespace == namespace_name,
Image.docker_image_id == docker_image_id))
if not fetched:
raise DataModelException('Unable to find image for tag with repo.')
return fetched[0]
def get_parent_images(image_obj):
@ -259,10 +268,10 @@ def get_parent_images(image_obj):
def create_or_update_tag(namespace_name, repository_name, tag_name,
tag_image_id):
tag_docker_image_id):
repo = Repository.get(Repository.name == repository_name,
Repository.namespace == namespace_name)
image = Image.get(Image.image_id == tag_image_id)
image = Image.get(Image.docker_image_id == tag_docker_image_id)
try:
tag = RepositoryTag.get(RepositoryTag.repository == repo,