summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Allow configuring API version for integration test with env varconfig_test_api_versionJoffrey F2017-01-2512-62/+73
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix Swarm model init to correctly pass arguments through to init_swarm1359-swarm-initJoffrey F2017-01-253-3/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Ignore socket files in utils.tarJoffrey F2017-01-241-0/+15
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Convert mode argument to valid structure in create_service1388-format-service-modeJoffrey F2017-01-192-2/+59
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1393 from aebm/masterJoffrey F2017-01-191-0/+5
|\ | | | | Fix #1351
| * Fix #1351Alejandro E. Brito Monedero2017-01-161-0/+5
| | | | | | | | | | | | | | | | * Fix TypeError when getting the tags property from an image that has no tags. Ex: An image pulled by cryptohash. It is handled like when the image doesn't have defined the RepoTags member. Signed-off-by: Alejandro E. Brito Monedero <alejandro.monedero@gmail.com>
* | Merge pull request #1347 from fcurella/hashBen Firshman2017-01-181-0/+14
|\ \ | |/ |/| Make resources hashable, so that they can be added to `set`s
| * Make resources hashable, so that they can be added to `set`sFlavio Curella2016-12-081-0/+14
| | | | | | | | Signed-off-by: Flavio Curella <flavio.curella@gmail.com>
* | Detect mount type in parse_mount_string1376-parse-mount-typeJoffrey F2017-01-091-12/+37
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Additional parse_mount_string testsJoffrey F2017-01-092-18/+32
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'dz-fix-mount_options' of https://github.com/dzimine/docker-py ↵Joffrey F2017-01-091-0/+16
|\ \ | | | | | | | | | | | | | | | into dzimine-dz-fix-mount_options Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Fix readonly in mounts.Dmitri2016-12-281-0/+16
| | | | | | | | | Signed-off-by: Dmitri Zimine dz@stackstorm.com
* | | Accept / as a path separator in dockerignore patterns on all platformscompose-4302-dockerignore-windowsJoffrey F2017-01-061-0/+18
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Prevent Swarm address conflictsjenkinsfileJoffrey F2016-12-087-19/+33
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1338 from docker/remove_nodeJoffrey F2016-12-071-0/+17
|\ | | | | Implement swarm node removal
| * Implement swarm node removalremove_nodeJoffrey F2016-12-071-0/+17
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Update code and tests for Engine 1.13 compatibilitydnephin-add-attachableJoffrey F2016-12-077-23/+42
| | | | | | | | | | | | Makefile now runs tests against Docker 1.13 RC Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix typo in create_networkJoffrey F2016-12-061-0/+11
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add attachable.Daniel Nephin2016-12-051-0/+4
| | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-startBen Firshman2016-12-051-0/+15
|\ \ | | | | | | exec: fix running with detach=True
| * | exec: fix running with detach=TrueTomas Tomecek2016-11-291-0/+15
| | | | | | | | | | | | | | | | | | Fixes #1271 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | Merge pull request #1331 from aanand/fix-auth-config-path-windowsJoffrey F2016-12-021-0/+53
|\ \ \ | |_|/ |/| | Fix auth config path on Windows
| * | Fix auth config path on WindowsAanand Prasad2016-12-021-0/+53
| | | | | | | | | | | | | | | | | | | | | The Engine client looks *only* at the USERPROFILE environment variable on Windows, so we should do that too. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #1315 from bfirsh/rename-docker-py-to-docker-sdk-pythonJoffrey F2016-12-021-1/+1
|\ \ \ | | | | | | | | Start to rename docker-py to docker-sdk-python
| * | | Start to rename docker-py to docker-sdk-pythonBen Firshman2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pretty much everything except renaming the GitHub repo and documentation, which is not actually done yet. Nearer the release we can do a search/replace for all that stuff. Ref #1310 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | | Merge pull request #1330 from docker/walkerlee-masterJoffrey F2016-12-021-1/+1
|\ \ \ \ | | | | | | | | | | Add options to IPAMConfig
| * \ \ \ Merge branch 'master' of https://github.com/walkerlee/docker-py into ↵Joffrey F2016-12-021-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | walkerlee-master Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | Add docker network IPAM options parameterWalker Lee2016-10-272-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Walker Lee <walkerlee.tw@gmail.com>
* | | | | Merge branch 'patch-1' of https://github.com/manics/docker-py into ↵manics-patch-1Joffrey F2016-12-021-0/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | manics-patch-1 Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Add test for creating service with envSimon Li2016-11-111-0/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Li <orpheus+devel@gmail.com>
* | | | | Merge pull request #1328 from docker/ssladapter_transport_moduleBen Firshman2016-12-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Move ssladapter to transport module
| * | | | | Move ssladapter to transport modulessladapter_transport_moduleJoffrey F2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | Client -> DockerClientJoffrey F2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Move config type creation from docker.utils functions to classes inconfig_typesJoffrey F2016-12-016-264/+280
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | docker.types Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Merge pull request #1303 from aanand/helpful-containers-warningBen Firshman2016-12-011-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Show a helpful warning when people try to call `client.containers()`
| * | | | | Show a helpful warning when people try to call `client.containers()`Aanand Prasad2016-11-281-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People upgrading to docker-py 2.0 without being aware of the new client API will likely try to call the old `containers()` method. This adds a helpful warning telling them to use APIClient to get the old API. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | | Merge pull request #1308 from docker/docker_clientJoffrey F2016-11-302-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Rename Client -> DockerClient
| * | | | | Rename Client -> DockerClientdocker_clientJoffrey F2016-11-282-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace references to old Client with APIClient Moved contents of services.md to appropriate locations Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Merge pull request #1277 from ↵Ben Firshman2016-11-291-1/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bodnarbm/do-not-traverse-ignored-directories-with-no-potential-exceptions Do not traverse excluded directories that are not prefixes of dockerignore exceptions.
| * | | | | Add unit tests for should_check_directory.Brandon Bodnar2016-11-261-1/+75
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
* | | | | Merge pull request #1297 from docker/stepanstipl-allow_custom_pid_modeJoffrey F2016-11-282-7/+13
|\ \ \ \ \ | | | | | | | | | | | | Allow custom pid mode
| * | | | | Re-enable pid_mode checks for API < 1.24stepanstipl-allow_custom_pid_modeJoffrey F2016-11-282-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | | Allow custom PID mode for the containerStepan Stipl2016-11-281-3/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker added support for sharing PID namespaces with other containers since version 1.12 (see https://github.com/docker/docker/pull/22481). Signed-off-by: Stepan Stipl <stepan@stipl.net>
* | | | | Merge pull request #1309 from bfirsh/remove-maintainer-from-dockerfilesJoffrey F2016-11-282-9/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove MAINTAINER from Dockerfiles
| * | | | | Remove MAINTAINER from DockerfilesBen Firshman2016-11-242-9/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was deprecated in https://github.com/docker/docker/pull/25466 (Sorry @shin- ;) Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | | | Merge pull request #1317 from ↵Joffrey F2016-11-281-1/+9
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | bfirsh/fix-environment-variable-file-with-new-lines Fix parsing for an environment file with newlines
| * | | | Fix parsing for an environment file with newlinesJon Cotton2016-11-281-1/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | Fixes the new, purposely broken test added in the previous commit. Signed-off-by: Jon Cotton <jc@finaltransfer.net>
* | | | Remove support for host_config in Client.startJoffrey F2016-11-281-35/+11
|/ / / | | | | | | | | | | | | | | | | | | Any additional arguments passed to start will raise a DeprecatedMethod (DockerException) exception. Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Add helpful error for APIClient methods on ClientBen Firshman2016-11-221-0/+14
| | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Add new user-focused APIBen Firshman2016-11-2221-32/+1583
| | | | | | | | | | | | | | | | | | See #1086 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
View Lorry Controller Status