Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | * Moved _container_config to utils.create_container_configmemoryswap | Joffrey F | 2015-02-11 | 3 | -134/+147 |
| | | | | * memswap_limit can now be provided as a string, similar to mem_limit | ||||
* | Merge pull request #485 from docker/pid_mode | Joffrey F | 2015-02-11 | 5 | -10/+56 |
|\ | | | | | Support for PID mode | ||||
| * | pid_mode integration testspid_mode | Joffrey F | 2015-02-11 | 1 | -0/+31 |
| | | |||||
| * | pid_mode documentation | Joffrey F | 2015-02-11 | 2 | -0/+4 |
| | | |||||
| * | Added support for pid_mode param | Joffrey F | 2015-02-11 | 2 | -10/+21 |
|/ | |||||
* | Merge pull request #480 from ggtools/events | Joffrey F | 2015-02-11 | 5 | -4/+115 |
|\ | | | | | Add missing options to the events command | ||||
| * | Add a `decode` parameter to the events command | Christophe Labouisse | 2015-02-11 | 1 | -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 events | Christophe Labouisse | 2015-02-11 | 2 | -6/+9 |
| | | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org> | ||||
| * | Fix flake8 issues | Christophe Labouisse | 2015-02-11 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org> | ||||
| * | Fix datetime issue with Python 2.6 | Christophe Labouisse | 2015-02-11 | 2 | -4/+7 |
| | | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org> | ||||
| * | Add missing options to the events command | Christophe Labouisse | 2015-02-11 | 5 | -3/+108 |
| | | | | | | | | | | | | | | - Add since, until and filters parameters to `Client.events` - Add missing `events`command in the documentation Signed-off-by: Christophe Labouisse <christophe@labouisse.org> | ||||
* | | Merge pull request #483 from docker/read_only_rootfs | Joffrey F | 2015-02-11 | 4 | -3/+40 |
|\ \ | |/ |/| | read_only parameter | ||||
| * | read_only parameterread_only_rootfs | Joffrey F | 2015-02-10 | 4 | -3/+40 |
|/ | |||||
* | Merge pull request #482 from docker/rename_container | Joffrey F | 2015-02-10 | 6 | -15/+74 |
|\ | | | | | New Client.rename() method | ||||
| * | rename() tests and docsrename_container | Joffrey F | 2015-02-10 | 4 | -1/+44 |
| | | |||||
| * | Bumped default API version, fixed rename() | Joffrey F | 2015-02-10 | 1 | -4/+12 |
| | | |||||
| * | Added rename method | Joffrey F | 2015-02-10 | 2 | -11/+19 |
| | | |||||
* | | Merge pull request #474 from gierschv/fix-build-remote | Joffrey F | 2015-02-10 | 2 | -0/+16 |
|\ \ | |/ |/| | Fix crash when building from remote sources | ||||
| * | Fix crash when building from remote sources | Vincent Giersch | 2015-02-04 | 2 | -0/+16 |
| | | | | | | | | | | | | | | 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> | ||||
* | | Back to dev version | Joffrey F | 2015-02-10 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #475 from gtaylor/public_timeout | Joffrey F | 2015-02-10 | 1 | -3/+3 |
|\ \ | | | | | | | Rename Client._timeout to timeout. | ||||
| * | | Rename Client._timeout to timeout. | Greg Taylor | 2015-02-04 | 1 | -3/+3 |
| |/ | |||||
* | | Merge pull request #476 from gtaylor/build_rm_defaults_doc | Joffrey F | 2015-02-04 | 1 | -1/+3 |
|\ \ | |/ |/| | Update Client.build() docs to note rm default mis-match | ||||
| * | Updating Client.build() doc to mention rm-mismatch. Fixes #332. | Greg Taylor | 2015-02-05 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #470 from docker/0.7.2-release0.7.2 | Joffrey F | 2015-02-01 | 2 | -1/+25 |
|\ | | | | | 0.7.2 release | ||||
| * | Bumped version0.7.2-release | Joffrey F | 2015-02-01 | 1 | -1/+1 |
| | | |||||
| * | Updated changelog | Joffrey F | 2015-02-01 | 1 | -0/+24 |
|/ | |||||
* | Fix #458 | Joffrey F | 2015-02-01 | 1 | -1/+1 |
| | |||||
* | Fix #466 | Joffrey F | 2015-02-01 | 2 | -4/+10 |
| | |||||
* | Bumped version back to dev | Joffrey F | 2015-02-01 | 1 | -1/+1 |
| | |||||
* | Additional tests and small improvement to auth.resolve_authconfig | Joffrey F | 2015-02-01 | 3 | -3/+58 |
| | |||||
* | Merge pull request #441 from dims/fix-log-streams | Joffrey F | 2015-02-01 | 1 | -28/+14 |
|\ | | | | | Fix to enable streaming container logs reliably | ||||
| * | Fix to enable streaming container logs reliably | Davanum Srinivas | 2015-01-19 | 1 | -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. | ||||
* | | Merge pull request #464 from hibooboo2/add_support_for_mac_address | Joffrey F | 2015-02-01 | 5 | -5/+38 |
|\ \ | | | | | | | Add Support for Mac Address | ||||
| * | | Add Support for Mac Address | James Harris | 2015-01-21 | 5 | -5/+38 |
| |/ | | | | | | | | | | | 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> | ||||
* | | Merge pull request #468 from wellbehavedsoftware/fix-auth-urls | Maxime Petazzoni | 2015-01-29 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix registry url canonicalization in resolve_authconfig | ||||
| * | fix registry url canonicalization in resolve_authconfig | James Pharaoh | 2015-01-29 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #462 from tutumcloud/fix_create_host_config | Joffrey F | 2015-01-16 | 1 | -5/+5 |
|\ | | | | | fix create_host_config method | ||||
| * | fix create_host_config method | bernardopericacho | 2015-01-16 | 1 | -5/+5 |
|/ | |||||
* | Fixed TestRestartingContainer0.7.1 | Joffrey F | 2015-01-13 | 1 | -2/+2 |
| | |||||
* | Merge pull request #460 from docker/0.7.1-release | Joffrey F | 2015-01-12 | 3 | -3/+21 |
|\ | | | | | 0.7.1 release | ||||
| * | Updated version and changelog0.7.1-release | Joffrey F | 2015-01-12 | 2 | -1/+18 |
| | | |||||
| * | Added deprecation warning for stream parameter in Client.build() | Joffrey F | 2015-01-12 | 1 | -2/+3 |
|/ | |||||
* | Merge branch 'master' of github.com:docker/docker-py | Joffrey F | 2015-01-12 | 1 | -1/+2 |
|\ | |||||
| * | Merge pull request #456 from naxhh/patch-1 | Maxime Petazzoni | 2015-01-11 | 1 | -1/+2 |
| |\ | | | | | | | Fix closing code tag in TLS doc. | ||||
| | * | Fix closing code tag in TLS doc. | Ignacio Tolstoy | 2015-01-11 | 1 | -1/+2 |
| |/ | | | | | Just a quick fix in the docs. | ||||
* | | Expanded on boot2docker SSL error resolution | Joffrey F | 2015-01-12 | 1 | -2/+6 |
| | | |||||
* | | Merge branch 'boot2docker-docs' of https://github.com/ziadsawalha/docker-py ↵ | Joffrey F | 2015-01-12 | 1 | -0/+14 |
|\ \ | |/ |/| | | | into ziadsawalha-boot2docker-docs | ||||
| * | Update boot2docker docs with tls workaround | Ziad Sawalha | 2014-12-20 | 1 | -0/+14 |
| | | |||||
* | | urllib3/requests issues | Joffrey F | 2015-01-09 | 3 | -9/+9 |
| | |