Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use create_host_config in start (unifying parameter processing)0.7.0-release | Joffrey F | 2014-12-18 | 4 | -81/+27 |
| | |||||
* | Improved integration tests to run on python3 and close sessions after in ↵ | Joffrey F | 2014-12-18 | 1 | -22/+50 |
| | | | | tearDown phase | ||||
* | Fix create_container environment parameter for python3 | Joffrey F | 2014-12-18 | 1 | -2/+2 |
| | |||||
* | Updated documentation | Joffrey F | 2014-12-18 | 2 | -1/+5 |
| | |||||
* | Added support for extra_hosts in create_host_config | Joffrey F | 2014-12-18 | 1 | -1/+11 |
| | |||||
* | Updated changelog | Joffrey F | 2014-12-18 | 1 | -0/+37 |
| | |||||
* | Bumped version | Joffrey F | 2014-12-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #427 from abanna/adding_multiple_dockercfg_support | Joffrey F | 2014-12-18 | 3 | -9/+49 |
|\ | | | | | adding the ability to login with different dockercfg files. | ||||
| * | updated parameter name to make more sense. | abanna | 2014-12-18 | 1 | -6/+4 |
| | | |||||
| * | missed a lint error | abanna | 2014-12-18 | 1 | -2/+4 |
| | | |||||
| * | adding the ability to login with different dockercfg files. | Alex Banna | 2014-12-18 | 3 | -8/+48 |
| | | |||||
* | | Merge pull request #435 from dims/fix-flake8-issues | Joffrey F | 2014-12-18 | 2 | -3/+4 |
|\ \ | | | | | | | flake8 fails with F821 for unicode under python 3.4.2 | ||||
| * | | flake8 fails with F821 for unicode under python 3.4.2 | Davanum Srinivas | 2014-12-18 | 2 | -3/+4 |
| |/ | |||||
* | | Merge pull request #432 from leth/fix_test_race | Joffrey F | 2014-12-18 | 1 | -23/+29 |
|\ \ | |/ |/| | Tidy up stream test harness & fix race conditions | ||||
| * | Tidy up stream test harness & fix race conditions | Marcus Cobden | 2014-12-18 | 1 | -23/+29 |
|/ | |||||
* | Retry on connection error | Joffrey F | 2014-12-17 | 1 | -4/+11 |
| | |||||
* | Use unicode() typecast instead of u'' literal (3.2 compat). Fixes #408 | Joffrey F | 2014-12-17 | 1 | -2/+2 |
| | |||||
* | Merge branch 'leth-master' | Joffrey F | 2014-12-17 | 2 | -24/+98 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/leth/docker-py into leth-master | Joffrey F | 2014-12-17 | 2 | -24/+98 |
| |\ |/ / | | | | | | | Conflicts: tests/test.py | ||||
| * | Consume from chunked streams without data loss | Marcus Cobden | 2014-12-16 | 2 | -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_config | Joffrey F | 2014-12-17 | 10 | -170/+772 |
|\ \ | | | | | | | Support for host config | ||||
| * | | Updated documentation with HostConfig informationhost_config | Joffrey F | 2014-12-17 | 3 | -6/+103 |
| | | | |||||
| * | | Re-added integration tests with hostconfig in start | Joffrey F | 2014-12-17 | 1 | -3/+162 |
| | | | |||||
| * | | Re-added start with hostconfig tests | Joffrey F | 2014-12-17 | 1 | -1/+241 |
| | | | |||||
| * | | Un-deprecated hostconfig in start | Joffrey F | 2014-12-17 | 1 | -33/+6 |
| | | | |||||
| * | | Fixed start_container tests | Joffrey F | 2014-12-17 | 1 | -16/+6 |
| | | | |||||
| * | | assertEquals -> assertEqual | Joffrey F | 2014-12-17 | 1 | -5/+5 |
| | | | |||||
| * | | Updated integration tests to use new host_config param | Joffrey F | 2014-12-17 | 1 | -37/+52 |
| | | | |||||
| * | | Fixed VolumesFrom bug | Joffrey F | 2014-12-17 | 1 | -1/+1 |
| | | | |||||
| * | | Prevent start_config from overriding host_config in create if no param is ↵ | Joffrey F | 2014-12-17 | 1 | -5/+11 |
| | | | | | | | | | | | | specified | ||||
| * | | Updated unit tests | Joffrey F | 2014-12-17 | 1 | -204/+221 |
| | | | | | | | | | | | | | | | * Warnings will now raise exceptions in unit tests * Updated several tests to use host_config | ||||
| * | | Updated mock API version | Joffrey F | 2014-12-17 | 1 | -1/+1 |
| | | | |||||
| * | | Added create_host_config helper in docker.utils | Joffrey F | 2014-12-17 | 2 | -1/+68 |
| | | | |||||
| * | | * create_container now supports a host_config param | Joffrey F | 2014-12-17 | 1 | -14/+52 |
|/ / | | | | | | | * Deprecation warnings added in Client.start | ||||
* | | Merge pull request #429 from dims/master | Joffrey F | 2014-12-17 | 2 | -5/+5 |
|\ \ | | | | | | | Devices should be separated by colon separated string | ||||
| * | | Devices should be separated by colon separated string | Davanum Srinivas | 2014-12-17 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | Totally bad test :( (written by me). The documentation and code should match now. Many thanks to pranavs18 for spotting the error and proposing the fix. | ||||
* | | | Merge pull request #430 from bfirsh/travis-docker | Joffrey F | 2014-12-17 | 1 | -3/+1 |
|\ \ \ | |_|/ |/| | | Run Travis tests on Docker | ||||
| * | | Run Travis tests on Docker | Ben Firshman | 2014-12-17 | 1 | -3/+1 |
|/ / | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk> | ||||
* | | Merge branch 'jseybold-master' | Joffrey F | 2014-12-15 | 2 | -2/+3 |
|\ \ | |||||
| * | | timeout param in wait documented | Joffrey F | 2014-12-15 | 1 | -0/+1 |
| | | | |||||
| * | | Added timeout param to Client.wait | Joffrey F | 2014-12-15 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #271 from robertglen/byteIO-seekfix | Joffrey F | 2014-12-15 | 1 | -0/+2 |
|\ \ | | | | | | | Fixed bug in utils.mkbuildcontext for BytesIO Dockerfiles | ||||
| * | | Should be done for StringIO objects as well | Robert Glen | 2014-07-10 | 1 | -0/+1 |
| | | | |||||
| * | | Fixed bug in utils.mkbuildcontext for BytesIO Dockerfiles | Robert Glen | 2014-07-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | - resetting dockerfile seek position to 0 after dockerfile.getvalue() is called - prevents traceback on line utils.py line 43 - 'IOError("end of file reached")' in tarfile.py | ||||
* | | | Added forcerm param in Client.build | Joffrey F | 2014-12-15 | 2 | -1/+4 |
| | | | |||||
* | | | Merge pull request #423 from docker/0.6.0-integration | Joffrey F | 2014-12-15 | 1 | -20/+15 |
|\ \ \ | | | | | | | | | Fixed integration tests | ||||
| * | | | Don't use old test image (deprecated ID scheme)0.6.0-integration | Joffrey F | 2014-12-15 | 1 | -14/+8 |
| | | | | |||||
| * | | | Better pull confirmation | Joffrey F | 2014-12-15 | 1 | -8/+6 |
| | | | | |||||
| * | | | Longer timeout when contacting hub | Joffrey F | 2014-12-15 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #421 from hammerdr/docker-build-pull | Joffrey F | 2014-12-15 | 3 | -2/+18 |
|\ \ \ \ | |_|_|/ |/| | | | Allow for pull as an option to docker build |