docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix create_plugin on Windows 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-05-24 17:20:45 -07:00 committed by Joffrey F
parent 17f41b5672
commit 95ad903c35
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/api/plugin.py
View File

@ -44,7 +44,10 @@ class PluginApiMixin(object):
""" """
url = self._url('/plugins/create') 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) res = self._post(url, params={'name': name}, data=archv)
self._raise_for_status(res) self._raise_for_status(res)
return True return True

2
tests/integration/api_plugin_test.py
View File

@ -135,7 +135,7 @@ class PluginTest(BaseAPIIntegrationTest):
def test_create_plugin(self): def test_create_plugin(self):
plugin_data_dir = os.path.join( 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( assert self.client.create_plugin(
'docker-sdk-py/dummy', plugin_data_dir 'docker-sdk-py/dummy', plugin_data_dir