summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Integration tests fixesintegration_fixesJoffrey F2015-01-091-35/+15
| |
* | Added RO volumes testsJoffrey F2015-01-081-7/+99
| |
* | Revert noop changeJoffrey F2015-01-081-10/+9
| |
* | Merge branch 'master' of https://github.com/rmohr/docker-py into rmohr-masterJoffrey F2015-01-082-12/+30
|\ \
| * | Keep unix socket alive with python3Roman Mohr2014-12-212-12/+30
| |/
* | Prioritize system-installed urllib3 over requests vendored urllib3.Joffrey F2015-01-082-12/+9
| |
* | Fix for issue #443Joffrey F2015-01-082-10/+28
| |
* | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-01-082-1/+2
|\ \
| * \ Merge pull request #453 from kkleidal/registry_authJoffrey F2015-01-081-1/+1
| |\ \ | | | | | | | | removed exception thrown if registry.hub.docker.com is explicitly define...
| | * | removed exception thrown if registry.hub.docker.com is explicitly defined in ↵Ken Leidal2015-01-081-1/+1
| |/ / | | | | | | | | | repository param for client.pull
| * | Update mkdocs.ymlJoffrey F2014-12-271-0/+1
| |/
* | Bump version back to devJoffrey F2015-01-081-1/+1
|/
* Merge pull request #436 from docker/0.7.0-release0.7.0Joffrey F2014-12-199-107/+132
|\ | | | | 0.7.0 release
| * Use create_host_config in start (unifying parameter processing)0.7.0-releaseJoffrey F2014-12-184-81/+27
| |
| * Improved integration tests to run on python3 and close sessions after in ↵Joffrey F2014-12-181-22/+50
| | | | | | | | tearDown phase
| * Fix create_container environment parameter for python3Joffrey F2014-12-181-2/+2
| |
| * Updated documentationJoffrey F2014-12-182-1/+5
| |
| * Added support for extra_hosts in create_host_configJoffrey F2014-12-181-1/+11
| |
| * Updated changelogJoffrey F2014-12-181-0/+37
| |
| * Bumped versionJoffrey F2014-12-181-1/+1
|/
* Merge pull request #427 from abanna/adding_multiple_dockercfg_supportJoffrey F2014-12-183-9/+49
|\ | | | | adding the ability to login with different dockercfg files.
| * updated parameter name to make more sense.abanna2014-12-181-6/+4
| |
| * missed a lint errorabanna2014-12-181-2/+4
| |
| * adding the ability to login with different dockercfg files.Alex Banna2014-12-183-8/+48
| |
* | Merge pull request #435 from dims/fix-flake8-issuesJoffrey F2014-12-182-3/+4
|\ \ | | | | | | flake8 fails with F821 for unicode under python 3.4.2
| * | flake8 fails with F821 for unicode under python 3.4.2Davanum Srinivas2014-12-182-3/+4
| |/
* | Merge pull request #432 from leth/fix_test_raceJoffrey F2014-12-181-23/+29
|\ \ | |/ |/| Tidy up stream test harness & fix race conditions
| * Tidy up stream test harness & fix race conditionsMarcus Cobden2014-12-181-23/+29
|/
* Retry on connection errorJoffrey F2014-12-171-4/+11
|
* Use unicode() typecast instead of u'' literal (3.2 compat). Fixes #408Joffrey F2014-12-171-2/+2
|
* Merge branch 'leth-master'Joffrey F2014-12-172-24/+98
|\
| * Merge branch 'master' of https://github.com/leth/docker-py into leth-masterJoffrey F2014-12-172-24/+98
| |\ |/ / | | | | | | Conflicts: tests/test.py
| * Consume from chunked streams without data lossMarcus Cobden2014-12-162-24/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #428 from docker/host_configJoffrey F2014-12-1710-170/+772
|\ \ | | | | | | Support for host config
| * | Updated documentation with HostConfig informationhost_configJoffrey F2014-12-173-6/+103
| | |
| * | Re-added integration tests with hostconfig in startJoffrey F2014-12-171-3/+162
| | |
| * | Re-added start with hostconfig testsJoffrey F2014-12-171-1/+241
| | |
| * | Un-deprecated hostconfig in startJoffrey F2014-12-171-33/+6
| | |
| * | Fixed start_container testsJoffrey F2014-12-171-16/+6
| | |
| * | assertEquals -> assertEqualJoffrey F2014-12-171-5/+5
| | |
| * | Updated integration tests to use new host_config paramJoffrey F2014-12-171-37/+52
| | |