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

Fix PostgresSQL compatibility and parent omittance securityworker

Browse source
This commit is contained in:
Quentin Machu 2015-10-14 13:48:04 -04:00 • committed by Jimmy Zelinskie
parent a99b8fcfe4
commit 1b41200e49
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
workers/securityworker.py
View file

@ -33,7 +33,6 @@ def _get_image_to_export(version):
images = (Image images = (Image
.select(candidates.c.docker_image_id, candidates.c.uuid, candidates.c.checksum) .select(candidates.c.docker_image_id, candidates.c.uuid, candidates.c.checksum)
.distinct()
.from_(candidates) .from_(candidates)
.order_by(db_random_func()) .order_by(db_random_func())
.tuples() .tuples()
@ -55,14 +54,13 @@ def _get_image_to_export(version):
images = (Image images = (Image
.select(candidates.c.docker_image_id, candidates.c.uuid, candidates.c.checksum, candidates.c.parent_docker_image_id, candidates.c.parent_storage_uuid) .select(candidates.c.docker_image_id, candidates.c.uuid, candidates.c.checksum, candidates.c.parent_docker_image_id, candidates.c.parent_storage_uuid)
.distinct()
.from_(candidates) .from_(candidates)
.order_by(db_random_func()) .order_by(db_random_func())
.tuples() .tuples()
.limit(BATCH_SIZE)) .limit(BATCH_SIZE))
for image in images: for image in images:
rimages.append({'docker_image_id': image[0], 'storage_uuid': image[1], 'storage_checksum': image[2], 'parent_docker_image_id': None, 'parent_storage_uuid': None}) rimages.append({'docker_image_id': image[0], 'storage_uuid': image[1], 'storage_checksum': image[2], 'parent_docker_image_id': image[3], 'parent_storage_uuid': image[4]})
# Re-shuffle, otherwise the images without parents will always be on the top # Re-shuffle, otherwise the images without parents will always be on the top
random.shuffle(rimages) random.shuffle(rimages)
@ -166,7 +164,7 @@ class SecurityWorker(Worker):
'TarSum': img['storage_checksum'], 'TarSum': img['storage_checksum'],
'Path': uri 'Path': uri
} }
if img['parent_docker_image_id'] is not None: if img['parent_docker_image_id'] is not None and img['parent_storage_uuid'] is not None:
request['ParentID'] = img['parent_docker_image_id']+'.'+img['parent_storage_uuid'] request['ParentID'] = img['parent_docker_image_id']+'.'+img['parent_storage_uuid']
# Post request # Post request