Fixes to ensuring existing code can process schema 2 manifests

image/docker/schema2/config.py

@@ -170,7 +170,7 @@ class DockerSchema2Config(object):
 
   def __init__(self, config_bytes):
     self._config_bytes = config_bytes
-    
+
     try:
       self._parsed = json.loads(config_bytes)
     except ValueError as ve:
@@ -191,6 +191,11 @@ class DockerSchema2Config(object):
     """ Returns the size of this config object. """
     return len(self._config_bytes)
 
+  @property
+  def bytes(self):
+    """ Returns the bytes of this config object. """
+    return self._config_bytes
+
   @property
   def labels(self):
     """ Returns a dictionary of all the labels defined in this configuration. """

image/docker/squashed.py

@@ -28,10 +28,9 @@ class SquashedDockerImageFormatter(TarImageFormatter):
   # daemon dies when trying to load the entire tar into memory.
   SIZE_MULTIPLIER = 1.2
 
-  def stream_generator(self, tag, manifest, synthetic_image_id, layer_iterator,
+  def stream_generator(self, tag, parsed_manifest, synthetic_image_id, layer_iterator,
                        tar_stream_getter_iterator, reporter=None):
     image_mtime = 0
-    parsed_manifest = manifest.get_parsed_manifest()
     created = parsed_manifest.created_datetime
     if created is not None:
       image_mtime = calendar.timegm(created.utctimetuple())