summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Force coverage dependency to a version supporting py3.2coverage-pinJoffrey F2015-09-211-0/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #772 from rutsky/patch-1Joffrey F2015-09-181-7/+7
|\ | | | | add missing dots at ends of command descriptions
| * add missing dots at ends of command descriptionsVladimir Rutsky2015-09-161-7/+7
| | | | | | | | Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
* | Merge pull request #779 from rutsky/patch-4Joffrey F2015-09-181-1/+1
|\ \ | | | | | | fix network_mode 'none' value
| * | fix network_mode 'none' valueVladimir Rutsky2015-09-181-1/+1
|/ / | | | | Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
* | Merge pull request #764 from docker/744-volume-api-supportJoffrey F2015-09-1615-104/+512
|\ \ | | | | | | Volume API support
| * | Improve volume cleanup logic744-volume-api-supportJoffrey F2015-09-161-4/+5
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Detail which exception is thrown by remove_volumeJoffrey F2015-09-161-1/+2
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Generic skip decorator for low API version accessible to all testsJoffrey F2015-09-1612-99/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add simpler version comparison functions Add decorator to enforce minimum version in API methods Fix utils imports Add minimum_version decorators on API methods that needed it GroupAdd test requires API version >= 1.20 Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add documentation for volume API methodsJoffrey F2015-09-161-1/+66
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Modify unit tests suite to allow mock routes to optionally be method-awareJoffrey F2015-09-164-47/+339
| | | | | | | | | | | | | | | | | | | | | Added mock API routes for volumes API Add unit tests and integration tests for volume API Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Basic volume API implementation.Joffrey F2015-09-153-1/+51
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge pull request #768 from ColinHuang/masterJoffrey F2015-09-151-1/+0
| |\ | |/ |/| Remove not exists file in MANIFEST.in
* | Remove not exists file in MANIFEST.inColin Huang2015-09-151-1/+0
|/ | | | Signed-off-by: Colin Huang <sidawei@gmail.com>
* GroupAdd testsJoffrey F2015-09-152-1/+36
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #767 from docker/group_add_supportJoffrey F2015-09-142-8/+22
|\ | | | | Support group_add param in host config
| * Support group_add param in host configgroup_add_supportJoffrey F2015-09-152-8/+22
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #763 from docker/api_splitupMaxime Petazzoni2015-09-139-1130/+1176
|\ | | | | API splitup
| * Move client internals back to Client class. Remove obsolete ClientBase classapi_splitupJoffrey F2015-09-113-293/+287
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Split different APIs into several mixins for clarity / easier maintenanceJoffrey F2015-09-118-874/+926
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Back to dev versionJoffrey F2015-09-101-1/+1
| |
* | Merge pull request #762 from docker/1.4.0-release1.4.0Joffrey F2015-09-103-6/+46
|\ \ | |/ |/| 1.4.0 release
| * Fixed regression test in py3 environments1.4.0-releaseJoffrey F2015-09-101-1/+4
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Updated changelogJoffrey F2015-09-102-5/+42
|/ | | | | | Bumped version to 1.4.0 Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #753 from docker/715-user-int-uidJoffrey F2015-09-102-1/+7
|\ | | | | Always send a string for the user param in create_container
| * 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
|\ \ | | | | | | CI fixes (wip)
| * | Add hello-world to temp images in pull testsci-fixesJoffrey F2015-09-091-0/+2
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Make integration tests more CI-friendly.Joffrey F2015-09-092-17/+10
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #757 from docker/756-containerized-integrationJoffrey F2015-09-094-5/+21
|\ \ | | | | | | Containerized Integration
| * | 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 maintainers
| * | Add @dnephin and @mnowster as maintainersAanand Prasad2015-09-021-0/+2
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | 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 Windows
| * | Default to 127.0.0.1:2375 on WindowsAanand Prasad2015-09-013-6/+19
| |/ | | | | | | | | | | Following the logic of the Docker client. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #752 from docker/697-stricter-url-constructionJoffrey F2015-08-313-46/+79
|\ \ | |/ |/| Stricter url construction
| * 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 improvements
| * Integration test improvementsAanand Prasad2015-08-314-49/+99
| | | | | | | | | | | | | | | | | | | | | | - Fix the setup step (the process has changed now that we're using pytest) - Skip tests that are unstable - Make better use of build caching Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #742 from aanand/fix-dockerignore-integration-testJoffrey F2015-08-271-15/+21
|\ \ | |/ |/| Fix .dockerignore integration test
| * Fix .dockerignore integration testAanand Prasad2015-08-261-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | - There was a typo (".dockerginore"), which meant that the exclusion of the .dockerignore file itself wasn't being tested. - Some of the file names were non-descriptive. - The test was inspecting the output of the build process, rather than running 'ls' in a new container, which meant it was full of extra output, and would fail when there was a cache hit. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | 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
| |\ \ | | | | | | | | Exec create user
| | * \ Merge branch 'master' into exec_create_userStephen Newey2015-08-1222-439/+840
| | |\ \
View Lorry Controller Status