| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 #386 from docker/0.6.0-release0.6.0 | Joffrey F | 2014-11-03 | 4 | -5/+47 |
| |\ | | | | | Release 0.6.0 | ||||
| | * | Fixed ChangeLog section titles0.6.0-release | Joffrey F | 2014-11-03 | 1 | -2/+2 |
| | | | |||||
| | * | Fixed integration test | Joffrey F | 2014-11-03 | 1 | -0/+2 |
| | | | |||||
| | * | exec -> execute | Joffrey F | 2014-11-03 | 2 | -3/+3 |
| | | | |||||
| | * | Merge branch 'master' into 0.6.0-release | Joffrey F | 2014-11-03 | 2 | -3/+5 |
| | |\ | |/ |/| | |||||
| * | | Merge branch 'master' of github.com:dotcloud/docker-py | Joffrey F | 2014-11-03 | 1 | -0/+2 |
| |\ \ | |||||
| | * \ | Merge pull request #333 from alexliew/change_remove_image | Joffrey F | 2014-11-03 | 1 | -0/+2 |
| | |\ \ | | | | | | | | | Change remove_image to check if image is a dictionary. | ||||
| | | * | | Remove trailing whitespace. | Alex | 2014-10-04 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Change remove_image to check if image is a dictionary and use Id value if it is. | Alex | 2014-10-01 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Changed assertIn to assertTrue(... in ...) (2.6 support) | Joffrey F | 2014-11-03 | 1 | -3/+3 |
| |/ / / | |||||
| | | * | Updated ChangeLog | Joffrey F | 2014-11-03 | 1 | -2/+42 |
| | | | | |||||
| | | * | Bumped version | Joffrey F | 2014-11-03 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Merge branch 'irachex-filters' | Joffrey F | 2014-11-03 | 6 | -9/+57 |
| |\ \ | |||||
| | * | | Updated tox.ini to also run utils_test.py tests | Joffrey F | 2014-11-03 | 1 | -0/+3 |
| | | | | |||||
| | * | | Merge branch 'filters' of github.com:irachex/docker-py into irachex-filters | Joffrey F | 2014-11-03 | 5 | -9/+54 |
| | |\ \ |/ / / | | | | | | | | | | | | | | | | Conflicts: docker/utils/__init__.py docker/utils/utils.py tests/utils_test.py | ||||
| | * | | Add support for filtering images and containers | Huayi Zhang | 2014-10-05 | 5 | -4/+50 |
| | |/ | | | | | | | | | | | | | [`filters` is a json encoded value of the filters (a map[string][string]) to process on the images list. ][1] The tricky thing is that we must convert boolean value to string and any filter value to list to make a `map[string][string]` json format [1]: https://docs.docker.com/reference/api/docker_remote_api_v1.14/#list-images | ||||
| * | | Merge pull request #319 from psftw/bugfix_history | Joffrey F | 2014-10-30 | 1 | -2/+1 |
| |\ \ | | | | | | | Make history() return json. | ||||
| | * | | Make history() return json. | Peter Salvatore | 2014-09-10 | 1 | -2/+1 |
| | |/ | |||||
| * | | Merge branch 'totem-feature_logs-tail' | Joffrey F | 2014-10-30 | 3 | -4/+36 |
| |\ \ | |||||
| | * \ | Merge branch 'feature_logs-tail' of github.com:totem/docker-py into ↵ | Joffrey F | 2014-10-30 | 3 | -4/+36 |
| | |\ \ |/ / / | | | | | | | | | | | | | | | | | | | totem-feature_logs-tail Conflicts: docker/client.py tests/fake_api.py | ||||
| | * | | Add support for tailing logs (introduced in API : v1.13) | sukrit007 | 2014-08-22 | 4 | -3/+36 |
| | | | | | | | | | | | | | Updated default version to v1.13 | ||||
| * | | | Merge pull request #379 from tutumcloud/logs_tail | Joffrey F | 2014-10-30 | 2 | -5/+11 |
| |\ \ \ | | | | | | | | | Added tail behaviour to logs command, same as CLI v1.3 (latest) | ||||
| | * | | | Added tail behaviour to logs command, same as CLI v1.3 (latest) | Alberto | 2014-10-27 | 2 | -5/+11 |
| | | | | | |||||
| * | | | | Merge pull request #381 from micahhausler/py3socket | Joffrey F | 2014-10-30 | 3 | -1/+25 |
| |\ \ \ \ | | | | | | | | | | | Fixed socket for PY3 - Fixes #342 | ||||
| | * | | | | Reverted Dockerfile | micahhausler | 2014-10-30 | 1 | -17/+5 |
| | | | | | | |||||
| | * | | | | Added test requirements to install | micahhausler | 2014-10-29 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Fixed conflict | micahhausler | 2014-10-29 | 25 | -447/+1394 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixed socket for py3 | micahhausler | 2014-10-28 | 3 | -6/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed broken Dockerfile * added .dockerignore | ||||
| * | | | | | | Merge pull request #385 from fbacchella/master | Joffrey F | 2014-10-30 | 1 | -1/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | When docker is stopped, docker-py receive a empty string | ||||
| | * | | | | | | White space cleaned | Fabrice Bacchella | 2014-10-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | When docker is stopped, docker-py receive a empty string in socket.readline() | Fabrice Bacchella | 2014-10-30 | 1 | -1/+5 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge branch 'master' of github.com:dotcloud/docker-py | Joffrey F | 2014-10-30 | 11 | -5/+107 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Added hosted docs info to README | Joffrey F | 2014-10-30 | 1 | -1/+4 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #324 from infoxchange/clear-unixconn-pool | Joffrey F | 2014-10-30 | 3 | -1/+47 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Clear UNIX connections pool to avoid ResourceWarnings | ||||
| | | * | | | | | Test resource warnings when using the client | Alexey Kotlyarov | 2014-09-22 | 2 | -0/+26 |
| | | | | | | | | |||||
| | | * | | | | | Clear the UNIX connection sockets properly | Alexey Kotlyarov | 2014-09-22 | 1 | -1/+21 |
| | | | |_|_|/ | | |/| | | | |||||
| | * | | | | | Merge pull request #326 from tomprince/patch-1 | Joffrey F | 2014-10-29 | 0 | -0/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add tests to sdist. | ||||
| | | * | | | | | Add tests to sdist. | Tom Prince | 2014-09-23 | 1 | -1/+2 |
| | | |/ / / / | |||||
| | * | | | | | Merge pull request #328 from alunduil/master | Joffrey F | 2014-10-29 | 1 | -1/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add tests to sdist. | ||||
| | | * | | | | | Add tests to sdist. | Alex Brandt | 2014-09-26 | 1 | -1/+2 |
| | | |/ / / / | |||||
| | * | | | | | Merge pull request #360 from proppy/kwargs-from-env | Joffrey F | 2014-10-29 | 6 | -2/+54 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | utils: add kwargs_from_env | ||||
| | | * | | | | | utils: add kwargs_from_env | Johan Euphrosine | 2014-10-29 | 6 | -2/+54 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'ewindisch-angry-poodle' | Joffrey F | 2014-10-30 | 2 | -2/+16 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Fix typo | Joffrey F | 2014-10-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'angry-poodle' of github.com:ewindisch/docker-py into ↵ | Joffrey F | 2014-10-30 | 2 | -2/+16 |
| | |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | ewindisch-angry-poodle | ||||
| | * | | | | | | Require highest level of client-supported SSL/TLS crypto | Eric Windisch | 2014-10-29 | 2 | -2/+16 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to TLS 1.2, support the highest locally supported crypto protocol. This eliminates the previous default of PROTOCOL_SSLv23, replacing it with what should be TLSv1 for Python 2.7 and TLSv1.2 for newer versions of Python 3. Developers using docker-py may still specify the ssl_version to override the default. Signed-off-by: Eric Windisch <eric@windisch.us> | ||||
| * | | | | | | Merge branch 'phensley-pause-unpause' | Joffrey F | 2014-10-29 | 6 | -0/+95 |
| |\ \ \ \ \ \ | |||||
 |
index : delta/docker-py.git | |
| github.com: dotcloud/docker-py.git |
| summaryrefslogtreecommitdiff |