Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | websocket-client for all versions1.3.0-release | Joffrey F | 2015-07-08 | 1 | -3/+1 |
| | |||||
* | Updated changelog | Joffrey F | 2015-07-08 | 1 | -0/+49 |
| | |||||
* | Bumped version to 1.3.0 | Joffrey F | 2015-07-08 | 1 | -1/+1 |
| | |||||
* | Removed execute() method | Joffrey F | 2015-07-08 | 1 | -13/+0 |
| | |||||
* | Added missing `Client.load_image` docs | Joffrey F | 2015-07-08 | 1 | -3/+15 |
| | | | | Clarified `Client.wait` docs | ||||
* | Merge pull request #669 from dano/fix-tty-streams2 | Joffrey F | 2015-07-08 | 4 | -49/+87 |
|\ | | | | | Fix handling output from tty-enabled containers. | ||||
| * | Fix handling output from tty-enabled containers. | Dan O'Reilly | 2015-07-06 | 4 | -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-1 | Maxime Petazzoni | 2015-07-02 | 1 | -1/+1 |
|\ | | | | | Fix missing apostrophes in docs | ||||
| * | Fix missing apostrophes in docs | Peter Kowalczyk | 2015-07-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #652 from docker/clientbase_extraction | Maxime Petazzoni | 2015-07-01 | 2 | -227/+240 |
|\ | | | | | ClientBase extraction | ||||
| * | ClientBase class to extract utility methods and constructor and sanitize ↵clientbase_extraction | Joffrey F | 2015-07-01 | 3 | -227/+241 |
| | | | | | | | | Client class | ||||
| * | Fix adapter bug + regression test | Joffrey F | 2015-07-01 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #651 from docker/fix_647 | Joffrey F | 2015-06-30 | 2 | -5/+19 |
|\ | | | | | Fix adapter bug + regression test | ||||
| * | Fix Unix socket adapter bug with double slash in path + regression testfix_647 | Joffrey F | 2015-06-30 | 2 | -5/+19 |
| | | |||||
* | | Merge pull request #644 from docker/memory-memswap-hostconfig | Joffrey F | 2015-06-30 | 3 | -63/+91 |
|\ \ | |/ |/| | memory / memswap in hostconfig | ||||
| * | Updated tests for mem_limit changesmemory-memswap-hostconfig | Joffrey F | 2015-06-19 | 1 | -53/+56 |
| | | |||||
| * | Moved mem_limit and memswap_limit to host_config for API version >= 1.19 | Joffrey F | 2015-06-19 | 2 | -10/+35 |
| | | |||||
* | | Merge pull request #661 from docker/fix_640 | Maxime Petazzoni | 2015-06-30 | 1 | -1/+1 |
|\ \ | | | | | | | Added git@ as a valid prefix for remote build paths | ||||
| * | | Added git@ as a valid prefix for remote build pathsfix_640 | Joffrey F | 2015-06-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #654 from Melraidin/master | Joffrey F | 2015-06-29 | 1 | -12/+44 |
|\ \ \ | |/ / |/| | | Prefer new Docker config location and format. | ||||
| * | | Prefer new Docker config location and format. | Kevin Martin | 2015-06-28 | 1 | -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 issue | Joffrey F | 2015-06-30 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'posita-id-resolution-in-check-resource' | Joffrey F | 2015-06-30 | 3 | -70/+22 |
|\ \ \ | |/ / |/| | | |||||
| * | | Cleanup | Joffrey F | 2015-06-30 | 1 | -3/+2 |
| | | | |||||
| * | | Merge branch 'id-resolution-in-check-resource' of ↵ | Joffrey F | 2015-06-30 | 3 | -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 Bogosian | 2015-05-20 | 3 | -69/+22 |
| | | | |||||
* | | | Merge pull request #653 from docker/fix_649 | Joffrey F | 2015-06-24 | 2 | -1/+6 |
|\ \ \ | | | | | | | | | Fix stop timeout bug | ||||
| * | | | Fix stop timeout bugfix_649 | Joffrey F | 2015-06-24 | 2 | -1/+6 |
|/ / / | |||||
* | | | Merge pull request #645 from docker/update-websocket-client-dep | Aanand Prasad | 2015-06-19 | 5 | -30/+5 |
|\ \ \ | | | | | | | | | Update websocket client dependency | ||||
| * | | | Simplified tox configupdate-websocket-client-dep | Joffrey F | 2015-06-19 | 1 | -19/+1 |
| | | | | |||||
| * | | | Updated websocket-client dependency to latest version (now supports python 3) | Joffrey F | 2015-06-19 | 4 | -11/+4 |
|/ / / | |||||
* | | | Merge branch 'cesanta-master' | Joffrey F | 2015-06-19 | 1 | -3/+8 |
|\ \ \ | |||||
| * | | | Support 401 status for v2 registry endpoint | Joffrey F | 2015-06-19 | 1 | -3/+6 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/cesanta/docker-py into ↵ | Joffrey F | 2015-06-19 | 1 | -1/+3 |
| |\ \ \ |/ / / / | | | | | | | | | cesanta-master | ||||
| * | | | Fix pinging an unauthenticated v2 registry | Marko Mikulicic | 2015-05-29 | 1 | -1/+3 |
| | | | | |||||
* | | | | Added Aanand (@aanand) as a maintainer | Joffrey F | 2015-06-19 | 1 | -2/+2 |
| |_|/ |/| | | |||||
* | | | Merge branch 'glogiotatidis-pullfix' | Joffrey F | 2015-06-19 | 1 | -1/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into ↵ | Joffrey F | 2015-06-19 | 1 | -1/+4 |
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | glogiotatidis-pullfix Conflicts: docker/client.py | ||||
| * | | | Fix pull parameter for docker server version < 1.7. | Giorgos Logiotatidis | 2015-06-01 | 1 | -0/+6 |
| | | | | |||||
| * | | | Set default value for pull to False on build(). Fixes 622. | Giorgos Logiotatidis | 2015-06-01 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #614 from ibuildthecloud/extra-host-list | Joffrey F | 2015-06-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Allow extra_hosts to be a list too | ||||
| * | | | Allow extra_hosts to be a list too | Darren Shepherd | 2015-05-27 | 1 | -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/master | Joffrey F | 2015-06-18 | 1 | -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 Moore | 2015-05-21 | 1 | -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 F | 2015-06-18 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Fixed import style | Joffrey F | 2015-06-18 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Merge branch 'use-wraps' of https://github.com/ssanderson/docker-py into ↵ | Joffrey F | 2015-06-18 | 1 | -0/+3 |
| |\ \ \ \ |/ / / / / | | | | | | | | | | | ssanderson-use-wraps | ||||
| * | | | | Use functools.wraps for check_resource decorator. | Scott Sanderson | 2015-06-02 | 1 | -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 F | 2015-06-18 | 3 | -3/+63 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into ↵ | Joffrey F | 2015-06-18 | 3 | -3/+63 |
| |\ \ \ \ |/ / / / / | | | | | | | | | | | aanand-allow-any-mode |