summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move client internals back to Client class. Remove obsolete ClientBase classapi_splitupJoffrey F2015-09-113-293/+287
* Split different APIs into several mixins for clarity / easier maintenanceJoffrey F2015-09-118-874/+926
* Merge pull request #753 from docker/715-user-int-uidJoffrey F2015-09-102-1/+7
|\
| * Test UID validity715-user-int-uidJoffrey F2015-08-311-1/+4
| * Use six.text_typeJoffrey F2015-08-311-1/+1
| * Always send a string for the user param in create_containerJoffrey F2015-08-312-1/+4
* | Merge pull request #760 from docker/ci-fixesJoffrey F2015-09-092-17/+12
|\ \
| * | Add hello-world to temp images in pull testsci-fixesJoffrey F2015-09-091-0/+2
| * | Make integration tests more CI-friendly.Joffrey F2015-09-092-17/+10
|/ /
* | Merge pull request #757 from docker/756-containerized-integrationJoffrey F2015-09-094-5/+21
|\ \
| * | Update integration-dind task756-containerized-integrationJoffrey F2015-09-092-20/+8
| * | Make running integration tests with dind possibleJoffrey F2015-09-095-5/+33
* | | Add missing ipc_mode documentationJoffrey F2015-09-091-0/+1
|/ /
* | Merge pull request #755 from aanand/add-dnephin-and-mnowsterJoffrey F2015-09-021-0/+2
|\ \
| * | Add @dnephin and @mnowster as maintainersAanand Prasad2015-09-021-0/+2
|/ /
* | Merge pull request #754 from aanand/default-to-tcp-url-on-windowsJoffrey F2015-09-013-6/+19
|\ \
| * | Default to 127.0.0.1:2375 on WindowsAanand Prasad2015-09-013-6/+19
| |/
* | Merge pull request #752 from docker/697-stricter-url-constructionJoffrey F2015-08-313-46/+79
|\ \ | |/ |/|
| * Test URL construction697-stricter-url-constructionJoffrey F2015-08-311-0/+22
| * url-quote user-provided param before inserting in URL.Joffrey F2015-08-312-46/+57
|/
* Test has been fixed, remove skip decoratorJoffrey F2015-08-311-1/+0
* Merge pull request #747 from aanand/integration-test-fixesJoffrey F2015-08-314-49/+99
|\
| * Integration test improvementsAanand Prasad2015-08-314-49/+99
* | Merge pull request #742 from aanand/fix-dockerignore-integration-testJoffrey F2015-08-271-15/+21
|\ \ | |/ |/|
| * Fix .dockerignore integration testAanand Prasad2015-08-261-15/+21
* | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-08-263-2/+41
|\ \
| * \ Merge pull request #662 from stevenewey/exec_create_userJoffrey F2015-08-263-2/+41
| |\ \
| | * \ Merge branch 'master' into exec_create_userStephen Newey2015-08-1222-439/+840
| | |\ \
| | | * \ Merge pull request #1 from docker/masterStephen Newey2015-08-1222-439/+840
| | | |\ \
| | * | | | Change unnecessary user=None in args to empty string and remove check.Stephen Newey2015-08-121-4/+1
| | * | | | 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
|\ \ \ \ \
View Lorry Controller Status