summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* * Moved _container_config to utils.create_container_configmemoryswapJoffrey F2015-02-113-134/+147
| | | | * memswap_limit can now be provided as a string, similar to mem_limit
* Merge pull request #485 from docker/pid_modeJoffrey F2015-02-115-10/+56
|\ | | | | Support for PID mode
| * pid_mode integration testspid_modeJoffrey F2015-02-111-0/+31
| |
| * pid_mode documentationJoffrey F2015-02-112-0/+4
| |
| * Added support for pid_mode paramJoffrey F2015-02-112-10/+21
|/
* Merge pull request #480 from ggtools/eventsJoffrey F2015-02-115-4/+115
|\ | | | | 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-112-6/+9
| | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
| * Fix flake8 issuesChristophe Labouisse2015-02-111-2/+2
| | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
| * Fix datetime issue with Python 2.6Christophe Labouisse2015-02-112-4/+7
| | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
| * Add missing options to the events commandChristophe Labouisse2015-02-115-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_rootfsJoffrey F2015-02-114-3/+40
|\ \ | |/ |/| read_only parameter
| * read_only parameterread_only_rootfsJoffrey F2015-02-104-3/+40
|/
* Merge pull request #482 from docker/rename_containerJoffrey F2015-02-106-15/+74
|\ | | | | New Client.rename() method
| * rename() tests and docsrename_containerJoffrey F2015-02-104-1/+44
| |
| * Bumped default API version, fixed rename()Joffrey F2015-02-101-4/+12
| |
| * Added rename methodJoffrey F2015-02-102-11/+19
| |
* | Merge pull request #474 from gierschv/fix-build-remoteJoffrey F2015-02-102-0/+16
|\ \ | |/ |/| Fix crash when building from remote sources
| * Fix crash when building from remote sourcesVincent Giersch2015-02-042-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 versionJoffrey F2015-02-101-1/+1
| |
* | Merge pull request #475 from gtaylor/public_timeoutJoffrey F2015-02-101-3/+3
|\ \ | | | | | | Rename Client._timeout to timeout.
| * | Rename Client._timeout to timeout.Greg Taylor2015-02-041-3/+3
| |/
* | Merge pull request #476 from gtaylor/build_rm_defaults_docJoffrey F2015-02-041-1/+3
|\ \ | |/ |/| Update Client.build() docs to note rm default mis-match
| * Updating Client.build() doc to mention rm-mismatch. Fixes #332.Greg Taylor2015-02-051-1/+3
|/
* Merge pull request #470 from docker/0.7.2-release0.7.2Joffrey F2015-02-012-1/+25
|\ | | | | 0.7.2 release
| * Bumped version0.7.2-releaseJoffrey F2015-02-011-1/+1
| |
| * Updated changelogJoffrey F2015-02-011-0/+24
|/
* Fix #458Joffrey F2015-02-011-1/+1
|
* Fix #466Joffrey F2015-02-012-4/+10
|
* Bumped version back to devJoffrey F2015-02-011-1/+1
|
* Additional tests and small improvement to auth.resolve_authconfigJoffrey F2015-02-013-3/+58
|
* 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.
* | Merge pull request #464 from hibooboo2/add_support_for_mac_addressJoffrey F2015-02-015-5/+38
|\ \ | | | | | | Add Support for Mac Address
| * | Add Support for Mac AddressJames Harris2015-01-215-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-urlsMaxime Petazzoni2015-01-291-1/+1
|\ \ | |/ |/| Fix registry url canonicalization in resolve_authconfig
| * fix registry url canonicalization in resolve_authconfigJames Pharaoh2015-01-291-1/+1
|/
* Merge pull request #462 from tutumcloud/fix_create_host_configJoffrey F2015-01-161-5/+5
|\ | | | | fix create_host_config method
| * fix create_host_config methodbernardopericacho2015-01-161-5/+5
|/
* Fixed TestRestartingContainer0.7.1Joffrey F2015-01-131-2/+2
|
* Merge pull request #460 from docker/0.7.1-releaseJoffrey F2015-01-123-3/+21
|\ | | | | 0.7.1 release
| * Updated version and changelog0.7.1-releaseJoffrey F2015-01-122-1/+18
| |
| * Added deprecation warning for stream parameter in Client.build()Joffrey F2015-01-121-2/+3
|/
* Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-01-121-1/+2
|\
| * Merge pull request #456 from naxhh/patch-1Maxime Petazzoni2015-01-111-1/+2
| |\ | | | | | | Fix closing code tag in TLS doc.
| | * Fix closing code tag in TLS doc.Ignacio Tolstoy2015-01-111-1/+2
| |/ | | | | Just a quick fix in the docs.
* | Expanded on boot2docker SSL error resolutionJoffrey F2015-01-121-2/+6
| |
* | Merge branch 'boot2docker-docs' of https://github.com/ziadsawalha/docker-py ↵Joffrey F2015-01-121-0/+14
|\ \ | |/ |/| | | into ziadsawalha-boot2docker-docs
| * Update boot2docker docs with tls workaroundZiad Sawalha2014-12-201-0/+14
| |
* | urllib3/requests issuesJoffrey F2015-01-093-9/+9
| |