summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Add test for root user as default exec_create behaviourStephen Newey2015-07-021-0/+17
| | * | | | Add user argument to exec_create documentation.Stephen Newey2015-06-302-1/+2
| | * | | | Add support for user on exec_create.Stephen Newey2015-06-302-2/+26
| | |/ / /
* | | | | Merge branch 'aanand-default-cert-path'Joffrey F2015-08-262-5/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use cross-platform home directory pathJoffrey F2015-08-261-3/+2
| * | | | Merge branch 'default-cert-path' of https://github.com/aanand/docker-py into ...Joffrey F2015-08-262-4/+41
| |\ \ \ \ |/ / / / /
| * | | | Default to ~/.docker if DOCKER_CERT_PATH is emptyAanand Prasad2015-07-212-4/+43
* | | | | Merge pull request #721 from aanand/pathspecJoffrey F2015-08-266-54/+273
|\ \ \ \ \
| * | | | | Better support for .dockerignoreAanand Prasad2015-08-266-54/+273
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mnowster-remove-driver-types'Joffrey F2015-08-263-44/+82
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't remove LogConfig.types shortcutJoffrey F2015-08-262-2/+7
| * | | | Test valid no args for log configMazz Mosley2015-08-261-2/+41
| * | | | Remove validation of supported log driversMazz Mosley2015-08-263-27/+26
| * | | | Fix log driver integration testMazz Mosley2015-08-261-20/+15
|/ / / /
* | | | Merge branch 'aanand-pytest'Joffrey F2015-08-258-241/+117
|\ \ \ \
| * | | | Ensure Makefile still run tests properly / tests are run in container as expe...Joffrey F2015-08-253-5/+6
| * | | | Merge branch 'pytest' of https://github.com/aanand/docker-py into aanand-pytestJoffrey F2015-08-256-238/+113
| |\ \ \ \ |/ / / / /
| * | | | Use pytest helpers to assert exceptions and deprecated warningsAanand Prasad2015-08-252-218/+104
| * | | | Run tests with pytestAanand Prasad2015-08-256-20/+9
* | | | | Merge pull request #735 from aanand/test-network-mode-versionJoffrey F2015-08-252-5/+12
|\ \ \ \ \
| * | | | | Prevent users from attempting to override 'version'Aanand Prasad2015-08-251-0/+5
| * | | | | Explicitly test NetworkMode logic in create_host_configAanand Prasad2015-08-251-5/+7
* | | | | | Merge pull request #736 from aanand/propagate-exceptions-in-testsJoffrey F2015-08-251-661/+347
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Stop catching Exception in tests where it isn't expectedAanand Prasad2015-08-251-661/+347
| |/ / / /
* | | | | Merge pull request #738 from bboreham/fix-deprecated-callJoffrey F2015-08-251-12/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Call Client.create_host_config because the old call is deprecatedBryan Boreham2015-08-251-12/+12
|/ / / /
* | | | Merge pull request #732 from docker/version-dependent-hostconfigAanand Prasad2015-08-256-58/+90
|\ \ \ \
| * | | | Update HostConfig docsJoffrey F2015-08-242-4/+5
| * | | | Adapt tests to new create_host_config usageJoffrey F2015-08-242-49/+63
| * | | | Add version param to utils.create_host_configJoffrey F2015-08-242-5/+22
* | | | | Merge pull request #733 from ColinHuang/docMaxime Petazzoni2015-08-251-0/+10
|\ \ \ \ \
| * | | | | Add resize API in docColin Huang2015-08-251-0/+10
| |/ / / /
* | | | | Merge pull request #734 from ColinHuang/masterMaxime Petazzoni2015-08-252-2/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Split the entrypoint string to shell-like syntax.Colin Huang2015-08-252-2/+5
|/ / / /
* | | | Merge branch 'mohitsoni-master'Joffrey F2015-08-242-1/+22
|\ \ \ \
| * | | | Added support for cgroup parentMohit Soni2015-08-242-1/+22
|/ / / /
* | | | Merge pull request #711 from ClusterHQ/exec_inspect_versionJoffrey F2015-08-241-2/+4
|\ \ \ \
| * | | | Update error message to state that exec_inspect is not supportedBridget McErlean2015-08-121-1/+3
| * | | | Change minimum API version for exec_inspectBridget McErlean2015-08-121-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #728 from aanand/debug-authJoffrey F2015-08-242-6/+49
|\ \ \ \
| * | | | Add logging for auth loading/resolutionAanand Prasad2015-08-202-6/+49
* | | | | Merge pull request #727 from mark-adams/fixes-726Joffrey F2015-08-202-6/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed #726 issue where split_port was checking `len(None)`Mark Adams2015-08-192-6/+22
|/ / / /
* | | | Merge pull request #724 from bedwards/bedwards-fluentd-patchJoffrey F2015-08-181-1/+3
|\ \ \ \
| * | | | add gelf and fluentd logging drivers to types.pyBrian Edwards2015-08-181-1/+3
|/ / / /
* | | | Merge pull request #719 from docker/allow-path-in-hostAanand Prasad2015-08-182-3/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Added full path parse_host unit testallow-path-in-hostJoffrey F2015-08-171-1/+4
| * | | Allow docker host (base_url) to contain a pathJoffrey F2015-08-171-2/+7
|/ / /
* | | Merge pull request #698 from docker/jhowardmsft-14530-netmodeJoffrey F2015-08-104-21/+39
|\ \ \
| * | | Explicited start config tricksjhowardmsft-14530-netmodeJoffrey F2015-08-101-11/+13