summaryrefslogtreecommitdiff
path: root/docker/client.py
Commit message (Collapse)AuthorAgeFilesLines
* * Moved _container_config to utils.create_container_configmemoryswapJoffrey F2015-02-111-133/+5
| | | | * memswap_limit can now be provided as a string, similar to mem_limit
* Added support for pid_mode paramJoffrey F2015-02-111-9/+13
|
* Merge pull request #480 from ggtools/eventsJoffrey F2015-02-111-3/+24
|\ | | | | Add missing options to the events command
| * Add a `decode` parameter to the events commandChristophe Labouisse2015-02-111-2/+2
| | | | | | | | | | | | | | This will ensure compatibility with the previous versions of docker-py. Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
| * Add decoding to the eventsChristophe Labouisse2015-02-111-2/+5
| | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
| * Fix flake8 issuesChristophe Labouisse2015-02-111-2/+2
| | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
| * Add missing options to the events commandChristophe Labouisse2015-02-111-2/+20
| | | | | | | | | | | | | | - Add since, until and filters parameters to `Client.events` - Add missing `events`command in the documentation Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
* | read_only parameterread_only_rootfsJoffrey F2015-02-101-2/+8
|/
* Merge pull request #482 from docker/rename_containerJoffrey F2015-02-101-12/+28
|\ | | | | New Client.rename() method
| * Bumped default API version, fixed rename()Joffrey F2015-02-101-4/+12
| |
| * Added rename methodJoffrey F2015-02-101-9/+17
| |
* | Merge pull request #474 from gierschv/fix-build-remoteJoffrey F2015-02-101-0/+2
|\ \ | |/ |/| Fix crash when building from remote sources
| * Fix crash when building from remote sourcesVincent Giersch2015-02-041-0/+2
| | | | | | | | | | | | | | Avoid crashing when the Docker python client is able to load registry credentials when building using a remote source Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
* | Rename Client._timeout to timeout.Greg Taylor2015-02-041-3/+3
|/
* Fix #458Joffrey F2015-02-011-1/+1
|
* Fix #466Joffrey F2015-02-011-4/+6
|
* Merge pull request #441 from dims/fix-log-streamsJoffrey F2015-02-011-28/+14
|\ | | | | Fix to enable streaming container logs reliably
| * Fix to enable streaming container logs reliablyDavanum Srinivas2015-01-191-28/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Started a ubuntu container that just runs "ping 8.8.8.8" and tried the sample code in https://gist.github.com/dims/c3327f633c526847c8e5 to recreate the problem mentioned in: https://github.com/docker/docker-py/issues/300 To debug the problem i printed the byte array read in recvall when reading STREAM_HEADER_SIZE_BYTES and realized that the data being read was far ahead of the actual start of the header documented in the vnd.docker.raw-stream of the docker remote api. This is possibly because the requests/urllib3 is reading ahead a bit more and we shouldn't be trying to hack the internals of those projects. So just using the documented file-like response.raw is good enough for us to get the functionality we need which is being able to read for exactly where the stream header starts. With this change i can reliably stream the logs just like "docker logs --follow". Note that we still need to access the underlying socket to set the timeout to prevent read time outs. The original fix was for client.logs() only but on further review it made sense to replace all occurances of _multiplexed_socket_stream_helper with the new method.
* | Add Support for Mac AddressJames Harris2015-01-211-4/+6
|/ | | | | | The new docker api allows specifing mac address for containers. This change is to allow docker py the same functionality. Signed-off-by: James Harris <james@rancher.com>
* Revert noop changeJoffrey F2015-01-081-10/+9
|
* Merge branch 'master' of https://github.com/rmohr/docker-py into rmohr-masterJoffrey F2015-01-081-12/+19
|\
| * Keep unix socket alive with python3Roman Mohr2014-12-211-12/+19
| |
* | Fix for issue #443Joffrey F2015-01-081-10/+14
|/
* Use create_host_config in start (unifying parameter processing)0.7.0-releaseJoffrey F2014-12-181-72/+11
|
* Fix create_container environment parameter for python3Joffrey F2014-12-181-2/+2
|
* Merge pull request #427 from abanna/adding_multiple_dockercfg_supportJoffrey F2014-12-181-2/+6
|\ | | | | adding the ability to login with different dockercfg files.
| * adding the ability to login with different dockercfg files.Alex Banna2014-12-181-2/+6
| |
* | flake8 fails with F821 for unicode under python 3.4.2Davanum Srinivas2014-12-181-1/+2
|/
* 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