Skip to content

Updated to use 'docker' module #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gijzelaerr merged 2 commits into from
Jul 6, 2017
Merged

Updated to use 'docker' module #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7984d87
Updated to use 'docker' module
mjbright May 4, 2017
46642b5
Modified to use docker.APIClient in place of docker.Client
mjbright May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ usage
import machine
import docker
m = machine.Machine(path="/usr/local/bin/docker-machine")
client = docker.Client(**m.config(machine='default'))
client = docker.APIClient(**m.config(machine='default'))
client.ping()


Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
__version__ = "0.2.2"

install_requires = [
'docker-py',
'docker',
]

setup(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_active(self):

def test_config(self):
config = self.machine.config(machine=TEST_MACHINE)
client = docker.Client(**config)
client = docker.APIClient(**config)
self.assertTrue(client.ping())


Expand Down