From 5509e9fbe90dd6bc90c3de0d23640d7f08722646 Mon Sep 17 00:00:00 2001 From: Konstantin Molchanov Date: Wed, 5 Jul 2017 12:15:57 +0400 Subject: [PATCH 1/3] Fix docker.client import. Apparently, docker package got updated and `Client` was replaced with `client`. --- docker_tabcomplete/queries.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker_tabcomplete/queries.py b/docker_tabcomplete/queries.py index ceb2710..41b23fc 100644 --- a/docker_tabcomplete/queries.py +++ b/docker_tabcomplete/queries.py @@ -1,4 +1,4 @@ -from docker import Client +from docker import client from docker_tabcomplete import parser @@ -26,7 +26,7 @@ def docker_images(docker_url, query): :returns: all matching images :rtype: set """ - cli = Client(base_url=docker_url) + cli = client(base_url=docker_url) results = set() images = cli.images() @@ -58,7 +58,7 @@ def docker_containers(docker_url, query, all=True): :returns: all matching containers :rtype: set """ - cli = Client(base_url=docker_url) + cli = client(base_url=docker_url) results = set() containers = cli.containers(all=all) @@ -88,7 +88,7 @@ def dockerhub_images(docker_url, query): :returns: Matched images :rtype: set """ - cli = Client(base_url=docker_url) + cli = client(base_url=docker_url) results = set() images = cli.search(query) From 85fa51f9723359c12e1c7ee4ccfd77fee6a5f170 Mon Sep 17 00:00:00 2001 From: Konstantin Molchanov Date: Wed, 5 Jul 2017 12:49:44 +0400 Subject: [PATCH 2/3] Fix stupid commit. --- docker_tabcomplete/queries.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker_tabcomplete/queries.py b/docker_tabcomplete/queries.py index 41b23fc..9e0d400 100644 --- a/docker_tabcomplete/queries.py +++ b/docker_tabcomplete/queries.py @@ -1,4 +1,4 @@ -from docker import client +from docker import DockerClient from docker_tabcomplete import parser @@ -26,7 +26,7 @@ def docker_images(docker_url, query): :returns: all matching images :rtype: set """ - cli = client(base_url=docker_url) + cli = DockerClient(base_url=docker_url) results = set() images = cli.images() @@ -58,7 +58,7 @@ def docker_containers(docker_url, query, all=True): :returns: all matching containers :rtype: set """ - cli = client(base_url=docker_url) + cli = DockerClient(base_url=docker_url) results = set() containers = cli.containers(all=all) @@ -88,7 +88,7 @@ def dockerhub_images(docker_url, query): :returns: Matched images :rtype: set """ - cli = client(base_url=docker_url) + cli = DockerClient(base_url=docker_url) results = set() images = cli.search(query) From d54309a8460bb1a0712e2b7ce9ee745ce2f401f9 Mon Sep 17 00:00:00 2001 From: Konstantin Molchanov Date: Wed, 5 Jul 2017 13:36:48 +0400 Subject: [PATCH 3/3] OMG I'm so stupid, here's the real fix. --- docker_tabcomplete/queries.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker_tabcomplete/queries.py b/docker_tabcomplete/queries.py index 9e0d400..5226699 100644 --- a/docker_tabcomplete/queries.py +++ b/docker_tabcomplete/queries.py @@ -1,4 +1,4 @@ -from docker import DockerClient +from docker import APIClient from docker_tabcomplete import parser @@ -26,7 +26,7 @@ def docker_images(docker_url, query): :returns: all matching images :rtype: set """ - cli = DockerClient(base_url=docker_url) + cli = APIClient(base_url=docker_url) results = set() images = cli.images() @@ -58,7 +58,7 @@ def docker_containers(docker_url, query, all=True): :returns: all matching containers :rtype: set """ - cli = DockerClient(base_url=docker_url) + cli = APIClient(base_url=docker_url) results = set() containers = cli.containers(all=all) @@ -88,7 +88,7 @@ def dockerhub_images(docker_url, query): :returns: Matched images :rtype: set """ - cli = DockerClient(base_url=docker_url) + cli = APIClient(base_url=docker_url) results = set() images = cli.search(query)