summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
| | |\ \
| | | * \ Merge pull request #1 from docker/masterStephen Newey2015-08-1222-439/+840
| | | |\ \ | | | | | | | | | | | | Update to latest master
| | * | | | 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
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | aanand-default-cert-path Conflicts: tests/utils_test.py
| * | | | Default to ~/.docker if DOCKER_CERT_PATH is emptyAanand Prasad2015-07-212-4/+43
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Merge pull request #721 from aanand/pathspecJoffrey F2015-08-266-54/+273
|\ \ \ \ \ | | | | | | | | | | | | Better support for .dockerignore
| * | | | | Better support for .dockerignoreAanand Prasad2015-08-266-54/+273
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support all basic pattern forms: file, directory, *, ?, ! - Fix handling of wildcard patterns and subdirectories - `*/a.py` should match `foo/a.py`, but not `foo/bar/a.py` - Fix handling of directory patterns with a trailing slash - make sure they're handled equivalently to those without one - Fix handling of custom Dockerfiles - make sure they go in the tarball Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | 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
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
| * | | | Remove validation of supported log driversMazz Mosley2015-08-263-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By having this hardcoded list of log drivers, it is a bottleneck to us supporting more log drivers. The daemon already validates if a log driver is valid or not, so rather than duplicating that validation, let's pass the log_driver along. This allows support for new/more log drivers as they become supported in docker without having to wait for both docker-py and docker-compose to support them. Keeping the current list of log driver types for backwards compatibility. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
| * | | | Fix log driver integration testMazz Mosley2015-08-261-20/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using `json-file` as the use case we can run this without needing to be on a machine with syslog installed. Even if syslog was installed, this test was still failing as the `log_opt` of 'key1' is an invalid option. This test is slightly different style to the others, it hopefully includes an example of how to space out tests for increased readability, we construct our tests in 3 phases(generally) and include a space imbetween them: - setup - perform action - assertions Expanded variable names is important for readability/clarity. Also reduced the number of assertions to focus on the logic we're testing. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
* | | | Merge branch 'aanand-pytest'Joffrey F2015-08-258-241/+117
|\ \ \ \
| * | | | Ensure Makefile still run tests properly / tests are run in container as ↵Joffrey F2015-08-253-5/+6
| | | | | | | | | | | | | | | | | | | | expected
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | | | Run tests with pytestAanand Prasad2015-08-256-20/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Merge pull request #735 from aanand/test-network-mode-versionJoffrey F2015-08-252-5/+12
|\ \ \ \ \ | | | | | | | | | | | | Explicitly test NetworkMode logic in create_host_config
| * | | | | Prevent users from attempting to override 'version'Aanand Prasad2015-08-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | | | | Explicitly test NetworkMode logic in create_host_configAanand Prasad2015-08-251-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | | Merge pull request #736 from aanand/propagate-exceptions-in-testsJoffrey F2015-08-251-661/+347
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Stop catching Exception in tests where it isn't expected
| * | | | | Stop catching Exception in tests where it isn't expectedAanand Prasad2015-08-251-661/+347
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The test runner will report on the exception anyway, so it's redundant. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Merge pull request #738 from bboreham/fix-deprecated-callJoffrey F2015-08-251-12/+12
|\ \ \ \ \ | |/ / / / |/| | | | Call Client.create_host_config because the old call is deprecated
| * | | | Call Client.create_host_config because the old call is deprecatedBryan Boreham2015-08-251-12/+12
|/ / / / | | | | | | | | | | | | Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
* | | | Merge pull request #732 from docker/version-dependent-hostconfigAanand Prasad2015-08-256-58/+90
|\ \ \ \ | | | | | | | | | | Version dependent hostconfig
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add create_host_config and create_container_config to Client for version awareness Trigger warning when create_host_config is used without version
* | | | | Merge pull request #733 from ColinHuang/docMaxime Petazzoni2015-08-251-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Add resize API in doc
| * | | | | 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.
| * | | | 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
|/ / / / | | | | | | | | | | | | Clean up cgroup_parent usage
* | | | Merge pull request #711 from ClusterHQ/exec_inspect_versionJoffrey F2015-08-241-2/+4
|\ \ \ \ | | | | | | | | | | Change minimum API version for exec_inspect
View Lorry Controller Status