Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use create_host_config in start (unifying parameter processing)0.7.0-release | Joffrey F | 2014-12-18 | 1 | -72/+11 |
| | |||||
* | Fix create_container environment parameter for python3 | Joffrey F | 2014-12-18 | 1 | -2/+2 |
| | |||||
* | Merge pull request #427 from abanna/adding_multiple_dockercfg_support | Joffrey F | 2014-12-18 | 1 | -2/+6 |
|\ | | | | | adding the ability to login with different dockercfg files. | ||||
| * | adding the ability to login with different dockercfg files. | Alex Banna | 2014-12-18 | 1 | -2/+6 |
| | | |||||
* | | flake8 fails with F821 for unicode under python 3.4.2 | Davanum Srinivas | 2014-12-18 | 1 | -1/+2 |
|/ | |||||
* | Merge branch 'master' of https://github.com/leth/docker-py into leth-master | Joffrey F | 2014-12-17 | 1 | -24/+7 |
|\ | | | | | | | | | Conflicts: tests/test.py | ||||
| * | Consume from chunked streams without data loss | Marcus Cobden | 2014-12-16 | 1 | -24/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Data already in local python buffers was lost when stream socket fileobject was re-created. We now use http.client to handle the chunk transfer encoding, and we read only the data from each chunk. This adds a test harness for stream responses which tries to trigger the lost-buffer behaviour by responding to the HTTP request in full, as early as possible. NB: Python's http.client will close the socket fileobj early if there is no content length or chunked transfer encoding header. If this happens, requests/urllib3 will reopen it, but we lose some data which was stored in buffers. | ||||
* | | Un-deprecated hostconfig in start | Joffrey F | 2014-12-17 | 1 | -33/+6 |
| | | |||||
* | | Prevent start_config from overriding host_config in create if no param is ↵ | Joffrey F | 2014-12-17 | 1 | -5/+11 |
| | | | | | | | | specified | ||||
* | | * create_container now supports a host_config param | Joffrey F | 2014-12-17 | 1 | -14/+52 |
|/ | | | | * Deprecation warnings added in Client.start | ||||
* | Added timeout param to Client.wait | Joffrey F | 2014-12-15 | 1 | -2/+2 |
| | |||||
* | Added forcerm param in Client.build | Joffrey F | 2014-12-15 | 1 | -1/+3 |
| | |||||
* | Fix the order of pull | Derek Hammer | 2014-12-15 | 1 | -3/+3 |
| | |||||
* | Allow for pull as an option to docker build | Derek Hammer | 2014-12-13 | 1 | -1/+2 |
| | | | | Signed-off-by: Derek Hammer <derek.r.hammer@gmail.com> | ||||
* | Merge pull request #318 from Precis/verified_login | Joffrey F | 2014-11-26 | 1 | -2/+3 |
|\ | | | | | Expand registry URL before login. | ||||
| * | Expand registry URL before login. | Matthias Erll | 2014-09-10 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #411 from docker/393-enforce-str-version | Joffrey F | 2014-11-26 | 1 | -0/+6 |
|\ \ | | | | | | | Enforce passing string as version param in ctor | ||||
| * | | Enforce passing string as version param in ctor393-enforce-str-version | Joffrey F | 2014-11-26 | 1 | -0/+6 |
| | | | |||||
* | | | Changed unicode literal to explicit typecast (3.2 compat) | Joffrey F | 2014-11-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'fix-env-variables-unicode' of github.com:maxcnunes/docker-py ↵ | Joffrey F | 2014-11-26 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | into maxcnunes-fix-env-variables-unicode | ||||
| * | | fixes problem when using environment variables that depends on utf-8 encoding | Max Claus Nunes | 2014-11-23 | 1 | -1/+1 |
| | | | |||||
* | | | Fix pep8 errors | Adrian Slade | 2014-11-14 | 1 | -2/+2 |
| | | | |||||
* | | | Allow ExtraHosts to be specified when creating a container | Adrian Slade | 2014-11-14 | 1 | -1/+12 |
|/ / | |||||
* | | Merge pull request #333 from alexliew/change_remove_image | Joffrey F | 2014-11-03 | 1 | -0/+2 |
|\ \ | | | | | | | Change remove_image to check if image is a dictionary. | ||||
| * | | Remove trailing whitespace. | Alex | 2014-10-04 | 1 | -1/+1 |
| | | | |||||
| * | | Change remove_image to check if image is a dictionary and use Id value if it is. | Alex | 2014-10-01 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'filters' of github.com:irachex/docker-py into irachex-filters | Joffrey F | 2014-11-03 | 1 | -2/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docker/utils/__init__.py docker/utils/utils.py tests/utils_test.py | ||||
| * | | | Add support for filtering images and containers | Huayi Zhang | 2014-10-05 | 1 | -2/+8 |
| |/ / | | | | | | | | | | | | | | | | | | | [`filters` is a json encoded value of the filters (a map[string][string]) to process on the images list. ][1] The tricky thing is that we must convert boolean value to string and any filter value to list to make a `map[string][string]` json format [1]: https://docs.docker.com/reference/api/docker_remote_api_v1.14/#list-images | ||||
* | | | Merge pull request #319 from psftw/bugfix_history | Joffrey F | 2014-10-30 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | Make history() return json. | ||||
| * | | | Make history() return json. | Peter Salvatore | 2014-09-10 | 1 | -2/+1 |
| |/ / | |||||
* | | | Merge branch 'feature_logs-tail' of github.com:totem/docker-py into ↵ | Joffrey F | 2014-10-30 | 1 | -4/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | totem-feature_logs-tail Conflicts: docker/client.py tests/fake_api.py | ||||
| * | | | Add support for tailing logs (introduced in API : v1.13) | sukrit007 | 2014-08-22 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | Updated default version to v1.13 | ||||
* | | | | Merge pull request #379 from tutumcloud/logs_tail | Joffrey F | 2014-10-30 | 1 | -2/+5 |
|\ \ \ \ | | | | | | | | | | | Added tail behaviour to logs command, same as CLI v1.3 (latest) | ||||
| * | | | | Added tail behaviour to logs command, same as CLI v1.3 (latest) | Alberto | 2014-10-27 | 1 | -2/+5 |
| | | | | | |||||
* | | | | | Merge pull request #381 from micahhausler/py3socket | Joffrey F | 2014-10-30 | 1 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed socket for PY3 - Fixes #342 | ||||
| * \ \ \ \ | Fixed conflict | micahhausler | 2014-10-29 | 1 | -7/+68 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed socket for py3 | micahhausler | 2014-10-28 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed broken Dockerfile * added .dockerignore | ||||
* | | | | | | | White space cleaned | Fabrice Bacchella | 2014-10-30 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | When docker is stopped, docker-py receive a empty string in socket.readline() | Fabrice Bacchella | 2014-10-30 | 1 | -1/+5 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'pause-unpause' of github.com:phensley/docker-py into ↵ | Joffrey F | 2014-10-29 | 1 | -0/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phensley-pause-unpause Conflicts: README.md tests/integration_test.py tests/test.py | ||||
| * | | | | | | Added pause/unpause methods. | Patrick Hensley | 2014-10-04 | 1 | -0/+14 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'support-devices' of github.com:dims/docker-py into ↵ | Joffrey F | 2014-10-29 | 1 | -1/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dims-support-devices Conflicts: README.md | ||||
| * | | | | | | Ability to specify Host Devices during container start | Davanum Srinivas | 2014-10-24 | 1 | -1/+4 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command line and daemon started supporting --device parameter during docker start a while ago in the following commit: docker/docker@e855c4b Since the command line looks like this, --device=[] Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc) This patch allows a list of strings to be passed into the start() method and we parse out the 3 components just like in the above mentioned commit | ||||
* | | | | | | Merge branch 'exec' of github.com:phensley/docker-py into phensley-exec | Joffrey F | 2014-10-29 | 1 | -1/+43 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md | ||||
| * | | | | | | Use shlex for exec string cmd, added integration testcase. | Patrick Hensley | 2014-10-22 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Fix typo in exec url. | Patrick Hensley | 2014-10-18 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Shorten overlong line, fix indent. | Patrick Hensley | 2014-10-17 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Implemented exec command. | Patrick Hensley | 2014-10-17 | 1 | -1/+42 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #306 from groundeffect/master | Joffrey F | 2014-10-29 | 1 | -5/+7 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Add support for 'cpuset' | ||||
| * | | | | | Move 'cpuset' to the end of the param list | groundeffect | 2014-10-25 | 1 | -6/+6 |
| | | | | | |