Merge pull request #107 from google/image-digest-1536684860

Fix bug in image digester

Author: KaylaNguyen

tools/image_digester_.py

@@ -48,6 +48,11 @@
     action='store',
     help='The path to the file storing the image config.')
 
+parser.add_argument(
+    '--manifest',
+    action='store',
+    help='The path to the file storing the image manifest.')
+
 parser.add_argument(
     '--digest',
     action='append',
@@ -77,6 +82,7 @@ def main():
   # If config is specified, use that.  Otherwise, fallback on reading
   # the config from the tarball.
   config = args.config
+  manifest = args.manifest
   if args.config:
     logging.info('Reading config from %r', args.config)
     with open(args.config, 'r') as reader:
@@ -86,6 +92,10 @@ def main():
     with v2_2_image.FromTarball(args.tarball) as base:
       config = base.config_file()
 
+  if args.manifest:
+    with open(args.manifest, 'r') as reader:
+      manifest = reader.read()
+
   if len(args.digest or []) != len(args.layer or []):
     logging.fatal('--digest and --layer must have matching lengths.')
     sys.exit(1)
@@ -94,7 +104,8 @@ def main():
   with v2_2_image.FromDisk(
       config,
       list(zip(args.digest or [], args.layer or [])),
-      legacy_base=args.tarball) as v2_2_img:
+      legacy_base=args.tarball,
+      foreign_layers_manifest=manifest) as v2_2_img:
 
     try:
       if args.oci: