summaryrefslogtreecommitdiff
path: root/docker
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-startBen Firshman2016-12-051-1/+2
|\
| * exec: fix running with detach=TrueTomas Tomecek2016-11-291-1/+2
* | Merge pull request #1331 from aanand/fix-auth-config-path-windowsJoffrey F2016-12-021-12/+24
|\ \
| * | Fix auth config path on WindowsAanand Prasad2016-12-021-12/+24
* | | Merge pull request #1315 from bfirsh/rename-docker-py-to-docker-sdk-pythonJoffrey F2016-12-024-7/+7
|\ \ \
| * | | Start to rename docker-py to docker-sdk-pythonBen Firshman2016-11-284-7/+7
* | | | Merge pull request #1330 from docker/walkerlee-masterJoffrey F2016-12-021-1/+8
|\ \ \ \
| * | | | Add options to IPAMConfigwalkerlee-masterJoffrey F2016-12-021-1/+8
| | |/ / | |/| |
* | | | Merge pull request #1327 from docker/compose4171_build_auth_headersJoffrey F2016-12-021-3/+19
|\ \ \ \
| * | | | Properly fill out auth headers in APIClient.build when usingcompose4171_build_auth_headersJoffrey F2016-12-011-3/+19
* | | | | Merge branch 'patch-1' of https://github.com/manics/docker-py into manics-pat...manics-patch-1Joffrey F2016-12-022-2/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use format_environment to convert env in ContainerSpecSimon Li2016-11-112-2/+6
* | | | | Merge pull request #1328 from docker/ssladapter_transport_moduleBen Firshman2016-12-024-7/+7
|\ \ \ \ \
| * | | | | Move ssladapter to transport modulessladapter_transport_moduleJoffrey F2016-12-014-7/+7
| | |/ / / | |/| | |
* | | | | Move config type creation from docker.utils functions to classes inconfig_typesJoffrey F2016-12-0112-701/+704
|/ / / /
* | | | Merge pull request #1303 from aanand/helpful-containers-warningBen Firshman2016-12-011-0/+6
|\ \ \ \
| * | | | Show a helpful warning when people try to call `client.containers()`Aanand Prasad2016-11-281-0/+6
* | | | | Merge pull request #1308 from docker/docker_clientJoffrey F2016-11-308-11/+133
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Rename Client -> DockerClientdocker_clientJoffrey F2016-11-288-11/+133
| | |_|/ | |/| |
* | | | Merge pull request #1277 from bodnarbm/do-not-traverse-ignored-directories-wi...Ben Firshman2016-11-291-19/+32
|\ \ \ \
| * | | | Prevent traversing excluded directories with no possible dockerignore exceptionsBrandon Bodnar2016-11-261-19/+32
| |/ / /
* | | | Merge pull request #1250 from mmerickel/fix/1211Joffrey F2016-11-281-3/+7
|\ \ \ \
| * | | | do not assume that read will consume the number of bytes requestedMichael Merickel2016-11-281-3/+7
| | |/ / | |/| |
* | | | Merge pull request #1297 from docker/stepanstipl-allow_custom_pid_modeJoffrey F2016-11-281-3/+3
|\ \ \ \
| * | | | Re-enable pid_mode checks for API < 1.24stepanstipl-allow_custom_pid_modeJoffrey F2016-11-281-0/+2
| * | | | Allow custom PID mode for the containerStepan Stipl2016-11-281-3/+1
| |/ / /
* | | | Merge pull request #1316 from bfirsh/add-example-for-tagJoffrey F2016-11-281-0/+5
|\ \ \ \
| * | | | Add example for tag()Ben Firshman2016-11-281-0/+5
| | |/ / | |/| |
* | | | Merge pull request #1317 from bfirsh/fix-environment-variable-file-with-new-l...Joffrey F2016-11-281-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix parsing for an environment file with newlinesJon Cotton2016-11-281-1/+5
| |/ /
* | | Merge pull request #1305 from bfirsh/update-setup-pyJoffrey F2016-11-281-1/+1
|\ \ \
| * | | Bump version to 2.0.0-devBen Firshman2016-11-281-1/+1
| |/ /
* | | Remove support for host_config in Client.startJoffrey F2016-11-281-66/+15
|/ /
* | Merge pull request #1186 from bfirsh/two-point-ohJoffrey F2016-11-2233-446/+4583
|\ \
| * | Add helpful error for APIClient methods on ClientBen Firshman2016-11-221-0/+10
| * | Add new user-focused APIBen Firshman2016-11-2214-30/+2297
| * | Add docstrings to low-level APIBen Firshman2016-11-2212-2/+1876
| * | Make ping return bool instead of stringBen Firshman2016-11-221-1/+1
| * | Rename Client to APIClientBen Firshman2016-11-223-49/+59
| * | Remove AutoVersionClientBen Firshman2016-11-222-11/+1
| * | Make docker.utils.ports a single fileBen Firshman2016-11-222-4/+0
| * | Make docker.ssladaptor a single fileBen Firshman2016-11-224-5/+2
| * | Make docker.auth a single fileBen Firshman2016-11-226-23/+7
| * | Drop support for API versions <1.24Ben Firshman2016-11-222-0/+9
* | | Fix ContainerApiMixin.copy with dict container argbiniambekele2016-11-221-1/+1
|/ /
* | Merge pull request #1236 from docker/host_config_isolationJoffrey F2016-11-171-1/+9
|\ \
| * | Add support for isolation param in host confighost_config_isolationJoffrey F2016-09-291-1/+9
* | | Convert dicts to Healthcheck objects, string commands to CMD-SHELL listsAanand Prasad2016-11-162-1/+10
* | | Add support for passing healthcheck to create_containerJamie Greeff2016-11-164-4/+60
* | | fix JSON key typo, it should not be underscores, but should be camelCase with...bin liu2016-11-111-1/+1
| |/ |/|