You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2017/04/29 01:02:00 UTC
[1/3] libcloud git commit: add an extra check otherwise
list_containers breaks with AttributeError
Repository: libcloud
Updated Branches:
refs/heads/trunk 408caa9c9 -> d80981463
add an extra check otherwise list_containers breaks with AttributeError
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/6fa1d542
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/6fa1d542
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/6fa1d542
Branch: refs/heads/trunk
Commit: 6fa1d5422a9ec861ff1a7b91c8c67c06702ae479
Parents: 408caa9
Author: johnnyWalnut <ik...@gmail.com>
Authored: Mon Apr 24 19:46:32 2017 +0300
Committer: Anthony Shaw <an...@apache.org>
Committed: Sat Apr 29 10:59:53 2017 +1000
----------------------------------------------------------------------
libcloud/container/drivers/docker.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/6fa1d542/libcloud/container/drivers/docker.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/docker.py b/libcloud/container/drivers/docker.py
index ac5c0a1..c51d6bf 100644
--- a/libcloud/container/drivers/docker.py
+++ b/libcloud/container/drivers/docker.py
@@ -54,7 +54,8 @@ class DockerResponse(JsonResponse):
# an error, but response status could still be 200
content_type = self.headers.get('content-type', 'application/json')
if content_type == 'application/json' or content_type == '':
- if self.headers.get('transfer-encoding') == 'chunked':
+ if self.headers.get('transfer-encoding') == 'chunked' and \
+ 'create?fromImage' in self.request.url:
body = [json.loads(chunk) for chunk in
self.body.strip().replace('\r', '').split('\n')]
else:
[3/3] libcloud git commit: changes for #1043
Posted by an...@apache.org.
changes for #1043
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/d8098146
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/d8098146
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/d8098146
Branch: refs/heads/trunk
Commit: d80981463c5d3f470129f3803dd957f8114b778d
Parents: f7a90d8
Author: Anthony Shaw <an...@apache.org>
Authored: Sat Apr 29 11:01:52 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Sat Apr 29 11:01:52 2017 +1000
----------------------------------------------------------------------
CHANGES.rst | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/d8098146/CHANGES.rst
----------------------------------------------------------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index 6e914b6..08a71ad 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -12,6 +12,13 @@ Common
[GITHUB-1038]
(Anthony Shaw)
+Container
+~~~~~~~~~
+
+- [DOCKER] fix add an extra check otherwise list_containers breaks with AttributeError when fromImages is specified
+ [GITHUB-1043]
+ (@johnnyWalnut)
+
Changes in Apache Libcloud 2.0.0
--------------------------------
[2/3] libcloud git commit: make check for install_image more generic
Closes #1043
Posted by an...@apache.org.
make check for install_image more generic
Closes #1043
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f7a90d89
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f7a90d89
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f7a90d89
Branch: refs/heads/trunk
Commit: f7a90d89124320a2584c7e05af0f1720456134af
Parents: 6fa1d54
Author: johnnyWalnut <ik...@gmail.com>
Authored: Thu Apr 27 15:01:43 2017 +0300
Committer: Anthony Shaw <an...@apache.org>
Committed: Sat Apr 29 11:00:07 2017 +1000
----------------------------------------------------------------------
libcloud/container/drivers/docker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/f7a90d89/libcloud/container/drivers/docker.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/docker.py b/libcloud/container/drivers/docker.py
index c51d6bf..26f550a 100644
--- a/libcloud/container/drivers/docker.py
+++ b/libcloud/container/drivers/docker.py
@@ -55,7 +55,7 @@ class DockerResponse(JsonResponse):
content_type = self.headers.get('content-type', 'application/json')
if content_type == 'application/json' or content_type == '':
if self.headers.get('transfer-encoding') == 'chunked' and \
- 'create?fromImage' in self.request.url:
+ 'fromImage' in self.request.url:
body = [json.loads(chunk) for chunk in
self.body.strip().replace('\r', '').split('\n')]
else: