Merge remote-tracking branch 'upstream/v2-phase4' into python-registry-v2

2015-10-22 16:59:28 -04:00 · 2015-10-22 16:59:28 -04:00 · e7a6176594
commit e7a6176594
parent 82e4adc6ca f2d4907528
105 changed files with 4439 additions and 2074 deletions
--- a/initdb.py
+++ b/initdb.py
@ -90,9 +90,7 @@ def __create_subtree(repo, structure, creator_username, parent, tag_map):
    # Write some data for the storage.
    if os.environ.get('WRITE_STORAGE_FILES'):
      storage_paths = StoragePaths()
-      paths = [storage_paths.image_json_path,
-               storage_paths.image_ancestry_path,
-               storage_paths.image_layer_path]
+      paths = [storage_paths.v1_image_layer_path]

      for path_builder in paths:
        path = path_builder(new_image.storage.uuid)