summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* websocket-client for all versions1.3.0-releaseJoffrey F2015-07-081-3/+1
|
* Updated changelogJoffrey F2015-07-081-0/+49
|
* Bumped version to 1.3.0Joffrey F2015-07-081-1/+1
|
* Removed execute() methodJoffrey F2015-07-081-13/+0
|
* Added missing `Client.load_image` docsJoffrey F2015-07-081-3/+15
| | | | Clarified `Client.wait` docs
* Merge pull request #669 from dano/fix-tty-streams2Joffrey F2015-07-084-49/+87
|\ | | | | Fix handling output from tty-enabled containers.
| * Fix handling output from tty-enabled containers.Dan O'Reilly2015-07-064-49/+87
|/ | | | | | | | | | | | Treat output from TTY-enabled containers as raw streams, rather than as multiplexed streams. The docker API docs specify that tty-enabled containers don't multiplex. Also update tests to pass with these changes, and changed the code used to read raw streams to not read line-by-line, and to not skip empty lines. Addresses issue #630 Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Merge pull request #666 from Slix/patch-1Maxime Petazzoni2015-07-021-1/+1
|\ | | | | Fix missing apostrophes in docs
| * Fix missing apostrophes in docsPeter Kowalczyk2015-07-021-1/+1
|/
* Merge pull request #652 from docker/clientbase_extractionMaxime Petazzoni2015-07-012-227/+240
|\ | | | | ClientBase extraction
| * ClientBase class to extract utility methods and constructor and sanitize ↵clientbase_extractionJoffrey F2015-07-013-227/+241
| | | | | | | | Client class
| * Fix adapter bug + regression testJoffrey F2015-07-011-1/+0
|/
* Merge pull request #651 from docker/fix_647Joffrey F2015-06-302-5/+19
|\ | | | | Fix adapter bug + regression test
| * Fix Unix socket adapter bug with double slash in path + regression testfix_647Joffrey F2015-06-302-5/+19
| |
* | Merge pull request #644 from docker/memory-memswap-hostconfigJoffrey F2015-06-303-63/+91
|\ \ | |/ |/| memory / memswap in hostconfig
| * Updated tests for mem_limit changesmemory-memswap-hostconfigJoffrey F2015-06-191-53/+56
| |
| * Moved mem_limit and memswap_limit to host_config for API version >= 1.19Joffrey F2015-06-192-10/+35
| |
* | Merge pull request #661 from docker/fix_640Maxime Petazzoni2015-06-301-1/+1
|\ \ | | | | | | Added git@ as a valid prefix for remote build paths
| * | Added git@ as a valid prefix for remote build pathsfix_640Joffrey F2015-06-301-1/+1
| | |
* | | Merge pull request #654 from Melraidin/masterJoffrey F2015-06-291-12/+44
|\ \ \ | |/ / |/| | Prefer new Docker config location and format.
| * | Prefer new Docker config location and format.Kevin Martin2015-06-281-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | This tries to load Docker authentication info from ~/.docker/config.json before falling back to its legacy location and format at ~/.dockercfg. Resolves https://github.com/docker/docker-py/issues/648
* | | Fix small decorator issueJoffrey F2015-06-301-2/+2
| | |
* | | Merge branch 'posita-id-resolution-in-check-resource'Joffrey F2015-06-303-70/+22
|\ \ \ | |/ / |/| |
| * | CleanupJoffrey F2015-06-301-3/+2
| | |
| * | Merge branch 'id-resolution-in-check-resource' of ↵Joffrey F2015-06-303-69/+22
| |\ \ |/ / / | | | | | | https://github.com/posita/docker-py into posita-id-resolution-in-check-resource
| * | Move image/container ID resolution to @check_resource decorator.Matt Bogosian2015-05-203-69/+22
| | |
* | | Merge pull request #653 from docker/fix_649Joffrey F2015-06-242-1/+6
|\ \ \ | | | | | | | | Fix stop timeout bug
| * | | Fix stop timeout bugfix_649Joffrey F2015-06-242-1/+6
|/ / /
* | | Merge pull request #645 from docker/update-websocket-client-depAanand Prasad2015-06-195-30/+5
|\ \ \ | | | | | | | | Update websocket client dependency
| * | | Simplified tox configupdate-websocket-client-depJoffrey F2015-06-191-19/+1
| | | |
| * | | Updated websocket-client dependency to latest version (now supports python 3)Joffrey F2015-06-194-11/+4
|/ / /
* | | Merge branch 'cesanta-master'Joffrey F2015-06-191-3/+8
|\ \ \
| * | | Support 401 status for v2 registry endpointJoffrey F2015-06-191-3/+6
| | | |
| * | | Merge branch 'master' of https://github.com/cesanta/docker-py into ↵Joffrey F2015-06-191-1/+3
| |\ \ \ |/ / / / | | | | | | | | cesanta-master
| * | | Fix pinging an unauthenticated v2 registryMarko Mikulicic2015-05-291-1/+3
| | | |
* | | | Added Aanand (@aanand) as a maintainerJoffrey F2015-06-191-2/+2
| |_|/ |/| |
* | | Merge branch 'glogiotatidis-pullfix'Joffrey F2015-06-191-1/+4
|\ \ \
| * \ \ Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into ↵Joffrey F2015-06-191-1/+4
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | glogiotatidis-pullfix Conflicts: docker/client.py
| * | | Fix pull parameter for docker server version < 1.7.Giorgos Logiotatidis2015-06-011-0/+6
| | | |
| * | | Set default value for pull to False on build(). Fixes 622.Giorgos Logiotatidis2015-06-011-1/+1
| |/ /
* | | Merge pull request #614 from ibuildthecloud/extra-host-listJoffrey F2015-06-181-1/+1
|\ \ \ | | | | | | | | Allow extra_hosts to be a list too
| * | | Allow extra_hosts to be a list tooDarren Shepherd2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current map syntax does not allow the API equivalent of --add-host foo:1.1.1.1 --add-host foo:2.2.2.2 The above will map one hostname to two IPs. The above is valid in Docker.
* | | | Merge pull request #609 from mattmoor/masterJoffrey F2015-06-181-1/+1
|\ \ \ \ | | | | | | | | | | Update docker-py to use a more portable sense of HOME.
| * | | | Update docker-py to use a more portable sense of HOME.Matt Moore2015-05-211-1/+1
| |/ / / | | | | | | | | | | | | | | | | This makes docker-py consistent with Docker's newish way of establishing the path to .dockercfg: https://github.com/docker/docker/blob/master/pkg/homedir/homedir.go
* | | | Merge branch 'ssanderson-use-wraps'Joffrey F2015-06-181-0/+4
|\ \ \ \
| * | | | Fixed import styleJoffrey F2015-06-181-2/+3
| | | | |
| * | | | Merge branch 'use-wraps' of https://github.com/ssanderson/docker-py into ↵Joffrey F2015-06-181-0/+3
| |\ \ \ \ |/ / / / / | | | | | | | | | | ssanderson-use-wraps
| * | | | Use functools.wraps for check_resource decorator.Scott Sanderson2015-06-021-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | This helps runtime introspection tools like the `help()` builting or IPython's `?` operator correctly find the underlying method instead of the decorator definition.
* | | | Merge branch 'aanand-allow-any-mode'Joffrey F2015-06-183-3/+63
|\ \ \ \
| * \ \ \ Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into ↵Joffrey F2015-06-183-3/+63
| |\ \ \ \ |/ / / / / | | | | | | | | | | aanand-allow-any-mode