Merge branch 'master' into git

This commit is contained in:
Jimmy Zelinskie 2015-03-19 12:10:34 -04:00
commit 5a29218c5c
173 changed files with 151322 additions and 527 deletions

View file

@ -75,7 +75,7 @@ def __create_subtree(repo, structure, creator_username, parent):
new_image.storage.checksum = checksum
new_image.storage.save()
creation_time = REFERENCE_DATE + timedelta(days=image_num)
creation_time = REFERENCE_DATE + timedelta(weeks=image_num) + timedelta(days=i)
command_list = SAMPLE_CMDS[image_num % len(SAMPLE_CMDS)]
command = json.dumps(command_list) if command_list else None
new_image = model.set_image_metadata(docker_image_id, repo.namespace_user.username, repo.name,
@ -365,6 +365,14 @@ def populate_database():
__generate_repository(new_user_1, 'simple', 'Simple repository.', False,
[], (4, [], ['latest', 'prod']))
__generate_repository(new_user_1, 'sharedtags',
'Shared tags repository',
False, [(new_user_2, 'read'), (dtrobot[0], 'read')],
(2, [(3, [], ['v2.0', 'v2.1', 'v2.2']),
(1, [(1, [(1, [], ['prod', '581a284'])],
['staging', '8423b58']),
(1, [], None)], None)], None))
__generate_repository(new_user_1, 'history', 'Historical repository.', False,
[], (4, [(2, [], 'latest'), (3, [], '#latest')], None))