Support --layers for schemaVersion 1 images

This commit is contained in:
Andreas de Pretis
2016-11-23 21:57:58 +01:00
parent d7411cb689
commit 8e7626c5dd

View File

@@ -166,7 +166,10 @@ class Registry:
print "error {}".format(self.__error) print "error {}".format(self.__error)
return [] return []
layers = json.loads(layers_result.text)['layers'] if json.loads(layers_result.text)['schemaVersion'] == 1:
layers = json.loads(layers_result.text)['fsLayers']
else:
layers = json.loads(layers_result.text)['layers']
return layers return layers
@@ -300,8 +303,12 @@ def main_loop(args):
print " tag: {}".format(tag) print " tag: {}".format(tag)
if args.layers: if args.layers:
for layer in registry.list_tag_layers(image_name, tag): for layer in registry.list_tag_layers(image_name, tag):
print " layer: {}, size: {}".format( if layer.has_key('size'):
layer['digest'], layer['size']) print " layer: {}, size: {}".format(
layer['digest'], layer['size'])
else:
print " layer: {}".format(
layer['blobSum'])
# delete tags if told so # delete tags if told so
if args.delete or args.delete_all: if args.delete or args.delete_all: