summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2018-05-24 17:20:45 -0700
committerJoffrey F <f.joffrey@gmail.com>2018-05-25 10:11:02 -0700
commit95ad903c35fc6781c18191b5cbc586ed4abd1d41 (patch)
tree8cc377790bbb9727a2a5027f4c9ce9f9458e15ec
parent17f41b56726957177724711b5bff6d51b02e6d93 (diff)
downloaddocker-py-95ad903c35fc6781c18191b5cbc586ed4abd1d41.tar.gz
Fix create_plugin on Windows
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--docker/api/plugin.py5
-rw-r--r--tests/integration/api_plugin_test.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/docker/api/plugin.py b/docker/api/plugin.py
index 73f1852..33d7419 100644
--- a/docker/api/plugin.py
+++ b/docker/api/plugin.py
@@ -44,7 +44,10 @@ class PluginApiMixin(object):
"""
url = self._url('/plugins/create')
- with utils.create_archive(root=plugin_data_dir, gzip=gzip) as archv:
+ with utils.create_archive(
+ root=plugin_data_dir, gzip=gzip,
+ files=set(utils.build.walk(plugin_data_dir, []))
+ ) as archv:
res = self._post(url, params={'name': name}, data=archv)
self._raise_for_status(res)
return True
diff --git a/tests/integration/api_plugin_test.py b/tests/integration/api_plugin_test.py
index 433d44d..1150b09 100644
--- a/tests/integration/api_plugin_test.py
+++ b/tests/integration/api_plugin_test.py
@@ -135,7 +135,7 @@ class PluginTest(BaseAPIIntegrationTest):
def test_create_plugin(self):
plugin_data_dir = os.path.join(
- os.path.dirname(__file__), 'testdata/dummy-plugin'
+ os.path.dirname(__file__), os.path.join('testdata', 'dummy-plugin')
)
assert self.client.create_plugin(
'docker-sdk-py/dummy', plugin_data_dir