From ea56d0b438bb61825f5e8b9f9d79c44f4852e2b4 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Feb 07 2017 17:45:28 +0000 Subject: add removeimage to dkr and flr-docker Signed-off-by: Adam Miller --- diff --git a/flr-docker b/flr-docker index 3374a38..6ecf123 100755 --- a/flr-docker +++ b/flr-docker @@ -41,7 +41,7 @@ def remotecopy(srcimg, destimg, daemon, registry, username): SRCIMG - Source Docker Image URI DESTIMG - Destination Docker Image URI - This utility exposes flr.container.DockerClient.remotecopy() to the cli + This utility exposes flr.dkr.remotecopy() to the cli """ if daemon: @@ -57,7 +57,24 @@ def remotecopy(srcimg, destimg, daemon, registry, username): username=username ) +@click.command() +@click.argument('imagename') +def removeimage(imagename): + """ + Remove a local docker image + + Usage: flr-docker removeimage IMAGENAME + + \b + IMAGENAME - Local Docker Image Name to remove + + This utility exposes flr.dkr.removeimage() to the cli + """ + + flr.dkr.removeimage(imagename) + cli.add_command(remotecopy) +cli.add_command(removeimage) if __name__ == '__main__': cli() diff --git a/flr/dkr.py b/flr/dkr.py index c617305..306e43f 100644 --- a/flr/dkr.py +++ b/flr/dkr.py @@ -96,4 +96,19 @@ def remotecopy(src_image, dest_image, client_args={}, registry=None, username=No ) dc.push(dest_image) +def removeimage(image_name): + """ + + :param image_name: str, name of docker image to remove + """ + + dc = client_connect() + + try: + dc.remove_image(image_name) + flr.log.info("Removed local image: {}".format(image_name)) + except Exception, e: + flr.log.error("Unable to remove image: {}".format(image_name)) + flr.log.error(e) + # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4