Merge branch 'master' into tutorial

Conflicts:
	endpoints/index.py
	static/css/quay.css
	static/js/app.js
	static/js/controllers.js
	test/data/test.db

data/model.py

@@ -109,7 +109,10 @@ def create_organization(name, email, creating_user):
 
     return new_org
   except InvalidUsernameException:
-    raise InvalidOrganizationException('Invalid organization name: %s' % name)
+    msg = ('Invalid organization name: %s Organization names must consist ' +
+           'solely of lower case letters, numbers, and underscores. ' + 
+           '[a-z0-9_]') % name
+    raise InvalidOrganizationException(msg)
 
 
 def create_robot(robot_shortname, parent):
@@ -970,6 +973,41 @@ def delete_tag_and_images(namespace_name, repository_name, tag_name):
     store.remove(repository_path)
 
 
+def garbage_collect_repository(namespace_name, repository_name):
+  # Get a list of all images used by tags in the repository
+  tag_query = (RepositoryTag
+    .select(RepositoryTag, Image)
+    .join(Image)
+    .switch(RepositoryTag)
+    .join(Repository)
+    .where(Repository.name == repository_name,
+           Repository.namespace == namespace_name))
+
+  referenced_anscestors = set()
+  for tag in tag_query:
+    # The anscestor list is in the format '/1/2/3/', extract just the ids
+    anscestor_id_strings = tag.image.ancestors.split('/')[1:-1]
+    ancestor_list = [int(img_id_str) for img_id_str in anscestor_id_strings]
+    referenced_anscestors = referenced_anscestors.union(set(ancestor_list))
+    referenced_anscestors.add(tag.image.id)
+
+  all_repo_images = get_repository_images(namespace_name, repository_name)
+  all_images = {int(img.id):img for img in all_repo_images}
+  to_remove = set(all_images.keys()).difference(referenced_anscestors)
+
+  logger.info('Cleaning up unreferenced images: %s', to_remove)
+
+  for image_id_to_remove in to_remove:
+    image_to_remove = all_images[image_id_to_remove]
+    image_path = store.image_path(namespace_name, repository_name,
+                                       image_to_remove.docker_image_id)
+    image_to_remove.delete_instance()
+    logger.debug('Deleting image storage: %s' % image_path)
+    store.remove(image_path)
+
+  return len(to_remove)
+
+
 def get_tag_image(namespace_name, repository_name, tag_name):
   joined = Image.select().join(RepositoryTag).join(Repository)
   fetched = list(joined.where(Repository.name == repository_name,
@@ -1021,7 +1059,8 @@ def create_or_update_tag(namespace_name, repository_name, tag_name,
                              (namespace_name, repository_name))
 
   try:
-    image = Image.get(Image.docker_image_id == tag_docker_image_id)
+    image = Image.get(Image.docker_image_id == tag_docker_image_id,
+                      Image.repository == repo)
   except Image.DoesNotExist:
     raise DataModelException('Invalid image with id: %s' %
                              tag_docker_image_id)