summaryrefslogtreecommitdiff
path: root/docker/client.py
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of https://github.com/leth/docker-py into leth-masterJoffrey F2014-12-171-24/+7
|\ | | | | | | | | Conflicts: tests/test.py
| * Consume from chunked streams without data lossMarcus Cobden2014-12-161-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 startJoffrey F2014-12-171-33/+6
| |
* | Prevent start_config from overriding host_config in create if no param is ↵Joffrey F2014-12-171-5/+11
| | | | | | | | specified
* | * create_container now supports a host_config paramJoffrey F2014-12-171-14/+52
|/ | | | * Deprecation warnings added in Client.start
* Added timeout param to Client.waitJoffrey F2014-12-151-2/+2
|
* Added forcerm param in Client.buildJoffrey F2014-12-151-1/+3
|
* Fix the order of pullDerek Hammer2014-12-151-3/+3
|
* Allow for pull as an option to docker buildDerek Hammer2014-12-131-1/+2
| | | | Signed-off-by: Derek Hammer <derek.r.hammer@gmail.com>
* Merge pull request #318 from Precis/verified_loginJoffrey F2014-11-261-2/+3
|\ | | | | Expand registry URL before login.
| * Expand registry URL before login.Matthias Erll2014-09-101-2/+3
| |
* | Merge pull request #411 from docker/393-enforce-str-versionJoffrey F2014-11-261-0/+6
|\ \ | | | | | | Enforce passing string as version param in ctor
| * | Enforce passing string as version param in ctor393-enforce-str-versionJoffrey F2014-11-261-0/+6
| | |
* | | Changed unicode literal to explicit typecast (3.2 compat)Joffrey F2014-11-261-1/+1
| | |
* | | Merge branch 'fix-env-variables-unicode' of github.com:maxcnunes/docker-py ↵Joffrey F2014-11-261-1/+1
|\ \ \ | |/ / |/| | | | | into maxcnunes-fix-env-variables-unicode
| * | fixes problem when using environment variables that depends on utf-8 encodingMax Claus Nunes2014-11-231-1/+1
| | |
* | | Fix pep8 errorsAdrian Slade2014-11-141-2/+2
| | |
* | | Allow ExtraHosts to be specified when creating a containerAdrian Slade2014-11-141-1/+12
|/ /
* | Merge pull request #333 from alexliew/change_remove_imageJoffrey F2014-11-031-0/+2
|\ \ | | | | | | Change remove_image to check if image is a dictionary.
| * | Remove trailing whitespace.Alex2014-10-041-1/+1
| | |
| * | Change remove_image to check if image is a dictionary and use Id value if it is.Alex2014-10-011-0/+2
| | |
* | | Merge branch 'filters' of github.com:irachex/docker-py into irachex-filtersJoffrey F2014-11-031-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docker/utils/__init__.py docker/utils/utils.py tests/utils_test.py
| * | | Add support for filtering images and containersHuayi Zhang2014-10-051-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_historyJoffrey F2014-10-301-2/+1
|\ \ \ | | | | | | | | Make history() return json.
| * | | Make history() return json.Peter Salvatore2014-09-101-2/+1
| |/ /
* | | Merge branch 'feature_logs-tail' of github.com:totem/docker-py into ↵Joffrey F2014-10-301-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | totem-feature_logs-tail Conflicts: docker/client.py tests/fake_api.py
| * | | Add support for tailing logs (introduced in API : v1.13)sukrit0072014-08-221-2/+5
| | | | | | | | | | | | | | | | Updated default version to v1.13
* | | | Merge pull request #379 from tutumcloud/logs_tailJoffrey F2014-10-301-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)Alberto2014-10-271-2/+5
| | | | |
* | | | | Merge pull request #381 from micahhausler/py3socketJoffrey F2014-10-301-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Fixed socket for PY3 - Fixes #342
| * \ \ \ \ Fixed conflictmicahhausler2014-10-291-7/+68
| |\ \ \ \ \
| * | | | | | Fixed socket for py3micahhausler2014-10-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed broken Dockerfile * added .dockerignore
* | | | | | | White space cleanedFabrice Bacchella2014-10-301-1/+1
| | | | | | |
* | | | | | | When docker is stopped, docker-py receive a empty string in socket.readline()Fabrice Bacchella2014-10-301-1/+5
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'pause-unpause' of github.com:phensley/docker-py into ↵Joffrey F2014-10-291-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phensley-pause-unpause Conflicts: README.md tests/integration_test.py tests/test.py
| * | | | | | Added pause/unpause methods.Patrick Hensley2014-10-041-0/+14
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'support-devices' of github.com:dims/docker-py into ↵Joffrey F2014-10-291-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dims-support-devices Conflicts: README.md
| * | | | | | Ability to specify Host Devices during container startDavanum Srinivas2014-10-241-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-execJoffrey F2014-10-291-1/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md
| * | | | | | Use shlex for exec string cmd, added integration testcase.Patrick Hensley2014-10-221-2/+2
| | | | | | |
| * | | | | | Fix typo in exec url.Patrick Hensley2014-10-181-1/+2
| | | | | | |
| * | | | | | Shorten overlong line, fix indent.Patrick Hensley2014-10-171-2/+2
| | | | | | |
| * | | | | | Implemented exec command.Patrick Hensley2014-10-171-1/+42
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #306 from groundeffect/masterJoffrey F2014-10-291-5/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add support for 'cpuset'
| * | | | | Move 'cpuset' to the end of the param listgroundeffect2014-10-251-6/+6
| | | | | |
| * | | | | Added support for 'cpuset'davy2014-08-271-5/+7
| | | | | |
* | | | | | Merge pull request #337 from heewa/catch_invalid_buildJoffrey F2014-10-221-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Catch invalid path in build method
| * | | | | Catch invalid path in build methodHeewa Barfchin2014-10-041-0/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | The server responds with an unuseful message (server error EOF), which happens because an empty tar file is sent over. So check in the client, who knows why that's happening and tell the user.
* | | | | Fix attaching with UNIX socketsBen Firshman2014-10-161-1/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | | | Stop TLS sockets being closed when attachingBen Firshman2014-10-161-2/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling attach_socket, the response is garbage collected, which triggers a close method on the file object, closing the socket. This stop the response from being garbage collected until we've finished with the underlying socket. Fixes #350 Signed-off-by: Ben Firshman <ben@firshman.co.uk>