summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-1' of https://github.com/manics/docker-py into manics-pat...manics-patch-1Joffrey F2016-12-023-2/+22
|\
| * Add test for creating service with envSimon Li2016-11-111-0/+16
| * Use format_environment to convert env in ContainerSpecSimon Li2016-11-112-2/+6
* | Merge pull request #1324 from docker/requests_2.12.2Joffrey F2016-12-021-1/+1
|\ \
| * | Exclude requests==2.12.2 from dependenciesrequests_2.12.2Joffrey F2016-11-301-1/+1
* | | Merge pull request #1328 from docker/ssladapter_transport_moduleBen Firshman2016-12-025-8/+8
|\ \ \
| * | | Move ssladapter to transport modulessladapter_transport_moduleJoffrey F2016-12-015-8/+8
* | | | Merge pull request #1319 from docker/config_typesBen Firshman2016-12-0218-973/+999
|\ \ \ \ | |/ / / |/| | |
| * | | Move config type creation from docker.utils functions to classes inconfig_typesJoffrey F2016-12-0119-974/+1000
* | | | Client -> DockerClientJoffrey F2016-12-011-1/+1
|/ / /
* | | Merge pull request #1303 from aanand/helpful-containers-warningBen Firshman2016-12-012-0/+17
|\ \ \
| * | | Show a helpful warning when people try to call `client.containers()`Aanand Prasad2016-11-282-0/+17
* | | | Merge pull request #1308 from docker/docker_clientJoffrey F2016-11-3014-287/+206
|\ \ \ \ | |_|/ / |/| | |
| * | | Rename Client -> DockerClientdocker_clientJoffrey F2016-11-2814-287/+206
* | | | Merge pull request #1277 from bodnarbm/do-not-traverse-ignored-directories-wi...Ben Firshman2016-11-292-20/+107
|\ \ \ \
| * | | | Add unit tests for should_check_directory.Brandon Bodnar2016-11-261-1/+75
| * | | | 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-283-10/+16
|\ \ \ \ \
| * | | | | Re-enable pid_mode checks for API < 1.24stepanstipl-allow_custom_pid_modeJoffrey F2016-11-283-4/+15
| * | | | | Allow custom PID mode for the containerStepan Stipl2016-11-282-6/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #1309 from bfirsh/remove-maintainer-from-dockerfilesJoffrey F2016-11-284-11/+0
|\ \ \ \ \
| * | | | | Remove MAINTAINER from DockerfilesBen Firshman2016-11-244-11/+0
| | |_|/ / | |/| | |
* | | | | 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-282-2/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix parsing for an environment file with newlinesJon Cotton2016-11-282-2/+14
| |/ / / /
* | | | | Merge pull request #1314 from bfirsh/specify-encoding-for-readmeJoffrey F2016-11-281-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Specify encoding when loading readmeBen Firshman2016-11-281-1/+2
| | |/ / | |/| |
* | | | Merge pull request #1305 from bfirsh/update-setup-pyJoffrey F2016-11-283-11/+8
|\ \ \ \
| * | | | Bump version to 2.0.0-devBen Firshman2016-11-281-1/+1
| * | | | Use find_packages in setup.pyBen Firshman2016-11-281-5/+2
| * | | | Update setup.py detailsBen Firshman2016-11-281-4/+4
| * | | | Update readme to say "Docker Engine API"Ben Firshman2016-11-281-1/+1
| | |/ / | |/| |
* | | | Merge pull request #822 from docker/no_start_configBen Firshman2016-11-282-101/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Remove support for host_config in Client.startJoffrey F2016-11-282-101/+26
|/ / /
* | | Merge pull request #1307 from docker/bfirsh_maintainerAanand Prasad2016-11-281-0/+6
|\ \ \ | |/ / |/| |
| * | Add Ben to MAINTAINERSbfirsh_maintainerJoffrey F2016-11-231-0/+6
|/ /
* | Merge pull request #1306 from bfirsh/mmmmmm-vector-graphicsJoffrey F2016-11-231-1/+1
|\ \
| * | Use SVG for build status badgeBen Firshman2016-11-231-1/+1
* | | Merge pull request #1304 from bfirsh/fix-documentation-linkJoffrey F2016-11-231-2/+4
|\ \ \ | |/ / |/| |
| * | Add warning about development version to readmeBen Firshman2016-11-231-0/+2
| * | Change package in readme back to docker-pyBen Firshman2016-11-231-1/+1
| * | Fix documentation link in readmeBen Firshman2016-11-231-1/+1
|/ /
* | Merge pull request #1186 from bfirsh/two-point-ohJoffrey F2016-11-22116-2927/+7369
|\ \
| * | Add helpful error for APIClient methods on ClientBen Firshman2016-11-222-0/+24
| * | Add new Sphinx documentationBen Firshman2016-11-2231-2137/+892
| * | Add new user-focused APIBen Firshman2016-11-2236-77/+3942
| * | Add docstrings to low-level APIBen Firshman2016-11-2212-2/+1876
View Lorry Controller Status