summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Implement swarm node removalremove_nodeJoffrey F2016-12-071-0/+17
| | | | Signed-off-by: Joffrey F <joffrey@docker.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>
* | | Add random_name test helperBen Firshman2016-11-222-7/+8
| | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Split out base integration test for APIClientBen Firshman2016-11-2212-64/+67
| | | | | | | | | | | | | | | | | | So the cleanup stuff can be reused for model tests. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Move APIClient tests into single fileBen Firshman2016-11-222-79/+71
| | | | | | | | | | | | | | | | | | For some reason this was spread across two files. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Rename DockerClientTest to BaseAPIClientTestBen Firshman2016-11-228-18/+18
| | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Rename Client to APIClientBen Firshman2016-11-2221-51/+55
| | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Remove AutoVersionClientBen Firshman2016-11-221-11/+0
| | | | | | | | | | | | | | | | | | Just do Client(version='auto'). Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Drop support for Python 2.6Ben Firshman2016-11-227-79/+35
| | | | | | | | | | | | | | | | | | | | | Because it's ancient. If you're still using it, you can use an old version of docker-py. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Make docker.ssladaptor a single fileBen Firshman2016-11-221-1/+1
| | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Make docker.auth a single fileBen Firshman2016-11-222-7/+5
| | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Merge pull request #1236 from docker/host_config_isolationJoffrey F2016-11-172-1/+23
|\ \ \ | | | | | | | | Add support for isolation param in host config
| * | | Add support for isolation param in host confighost_config_isolationJoffrey F2016-09-292-1/+23
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Convert dicts to Healthcheck objects, string commands to CMD-SHELL listsAanand Prasad2016-11-161-34/+29
| | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | Rework healthcheck integration testAanand Prasad2016-11-162-27/+57
| | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | Add support for passing healthcheck to create_containerJamie Greeff2016-11-161-0/+35
| | | | | | | | | | | | | | | | Signed-off-by: Jamie Greeff <jamie@greeff.me>
* | | | Merge pull request #1281 from ↵Joffrey F2016-11-141-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | TomasTomecek/1265-ssl-test-no-sslX-support-in-openssl ssl,test: OpenSSL may not support ssl2
| * | | | ssl,test: OpenSSL may not support ssl2Tomas Tomecek2016-11-141-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Fixes #1265 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | | Fix linting errorAanand Prasad2016-11-141-0/+1
|/ / / | | | | | | | | | | | | | | | | | | This seems to have been ignored by older versions of flake8, and fixed in version 3.1.0 or 3.1.1. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Add labels and shmsize arguments to the image buildRyan Belgrave2016-11-081-0/+38
| | | | | | | | | | | | Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
* | | Fix broken unit testBen Firshman2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | Introduced by https://github.com/docker/docker-py/pull/1230 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Merge pull request #1230 from LabattFoodService/updateNodeJoffrey F2016-11-073-0/+65
|\ \ \ | | | | | | | | enable setting of node labels #1225
| * | | enable setting of node labels #1225Nathan Shirlberg2016-09-273-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added update_node function to enable setting labels on nodes. This exposes the Update a Node function from the Docker API and should enable promoting/demoting manager nodes inside a swarm. Signed-off-by: Nathan Shirlberg <nshirlberg@labattfood.com>
* | | | WIPJoffrey F2016-11-041-0/+62
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status