docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,158 Commits 23 Branches 129 Tags 9.1 MiB
Commit Graph

385 Commits

Author SHA1 Message Date
Ian Campbell 5abf671442
Merge pull request #2282 from ulyssessouza/avoid-race-condition-on-autoremove 
Avoid race condition on short execution
 2019-03-25 12:00:28 +00:00
Ulysses Souza 8f42dd1484 Avoid race condition on short execution 
- Add a sleep of 2 seconds to be sure the logs
can be requested before the daemon removes the
container when run with auto_remove=True

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-25 12:42:54 +01:00
Hannes Ljungberg 523371e21d Move volume_driver to RUN_HOST_CONFIG_KWARGS 
Fixes #2271

Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-23 20:57:23 +01:00
Barry Shapira d6cc972cd9 Split monolithic integration tests into individual tests. 
The integration tests require restarting the swarm once for each
test.  I had done so manually with self.init_swarm(force_new_cluster=True)
but that wasn't resetting the swarm state correctly.  The usual
test teardown procedure cleans up correctly.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:40:27 +01:00
Barry Shapira 781dc30ad4 Check API version before setting swarm addr pool. 
Also corrected a documentation error: the default API version from
constants is currently 1.35, not 1.30 as was sometimes listed.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>

Removed accidental whitespace.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:40:27 +01:00
Barry Shapira 5d69a0a62e Added arguments to creeate a swarm with a custom address pool and subnet size. 
Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:38:13 +01:00
Hannes Ljungberg 7143cf02ab Test port lookup with protocols 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-18 22:15:49 +01:00
Hannes Ljungberg d429a823ed Make PlacementPreference build correct context 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-01-18 21:50:31 +01:00
Joffrey F a579e9e205 Remove use_config_proxy from exec. Add use_config_proxy docs to DockerClient 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-09 14:45:13 -08:00
Sebastiaan van Stijn 219c52141e
Regression 443 test: relax status-code check 
This test was testing for a 500 status, but this status
is actually a bug in the API (as it's due to an invalid
request), and the API should actually return a 400 status.

To make this test handle both situations, relax the test
to accept either a 4xx or 5xx status.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-09 21:23:11 +01:00
Joffrey F 65bebc085a Style fixes and removed some unused code 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 2c4a8651a8 By default, disable proxy support 
This is to avoid a breaking change

Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 0d37390c46 add integration tests for proxy support 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Joffrey F 72f4f527ad Update test dependencies to latest version, fix some flake8 errors 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-09 11:18:40 -08:00
Corentin Henry 7b3b83dfdb fix exec api inconsistency 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2018-11-28 15:16:23 -08:00
Corentin Henry 76447d0ca3 tests various exec_create/exec_start combinations 
Test the interation of the tty, demux and stream parameters

Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2018-11-28 13:37:17 -08:00
Corentin Henry 5f157bbaca implement stream demultiplexing for exec commands 
fixes https://github.com/docker/docker-py/issues/1952

Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2018-11-27 17:01:48 -08:00
Joffrey F e237c0ea16 Add named parameter to image.save to identify which repository name to use in the resulting tarball 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-06 14:46:37 -08:00
Joffrey F 6bfe2005e0 Clear error for cancellable streams over SSH 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-01 15:24:22 -07:00
Joffrey F 94aa9a89f7 Update tests to properly dispose of client instances in tearDown 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-01 15:24:22 -07:00
Joffrey F 1df021ee24 Update tests for ssh protocol compatibility 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-01 15:24:22 -07:00
Joffrey F a3111d9e00 Add xfail to ignore 18.09 beta bug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-31 18:05:26 -07:00
Joffrey F 82445764e0 Add support for RollbackConfig 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-09 16:41:25 -07:00
Joffrey F 14524f19e2 Add version checks and test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-09 15:56:11 -07:00
Marco Trillo 098318ad95 Add support for `uts_mode` parameter in `Client.create_host_config`. 
This parameter allows to set the UTS namespace of the container, as in
the `--uts=X` Docker CLI parameter:
<https://docs.docker.com/engine/reference/run/#uts-settings---uts>
The only allowed value, if set, is "host".

Signed-off-by: Marco Trillo <martri@arantia.com>
Signed-off-by: Diego Alvarez <dyako.developer@gmail.com>
 2018-06-29 14:54:49 +02:00
Joffrey F 8c35eee0fb Fix support for legacy .dockercfg auth config format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-27 17:04:32 -07:00
Joffrey F b4efdc1b28 Fix several integration tests on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-25 10:11:02 -07:00
Joffrey F 95ad903c35 Fix create_plugin on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-25 10:11:02 -07:00
Joffrey F 17f41b5672 Avoid unwanted modification of dockerfile path 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-25 10:11:02 -07:00
Joffrey F 827bd98d07 Merge branch 'master' of github.com:docker/docker-py 2018-04-25 16:30:24 -07:00
Joffrey F 8360ecae97 prune_builds test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-25 16:29:41 -07:00
Joffrey F ae8f77737c Fix session timeout = None case 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-25 15:31:26 -07:00
Joffrey F da028d88a2 Total timeout should be HTTP timeout + operation timeout 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-25 15:31:26 -07:00
Matthieu Nottale cef9940ed3 stop(), restart(): Adjust request timeout. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-04-25 15:31:26 -07:00
Joffrey F 1d6f8ecf92 Support absolute paths for in-context Dockerfiles 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-12 13:22:47 -07:00
Joffrey F 16751ac509 Properly handle relative Dockerfile paths and Dockerfile on different drives 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 11:00:41 -07:00
Joffrey F 9ff787cb5f Add methods for /distribution/<name>/json endpoint 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-29 15:45:06 -07:00
Joffrey F 081b78f15e Support building with Dockerfile outside of context 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-27 11:12:05 -07:00
Joffrey F c88db80f01 Add isolation param to build 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-23 14:14:49 +01:00
Joffrey F 284c3d90d6 Remove redundant single-socket select call 
Clean up + use pytest-timeout

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-20 09:25:29 +01:00
Viktor Adam 719d4e9e20 Allow cancelling the streams from other threads 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2018-03-20 09:25:29 +01:00
Joffrey F 90c0dbe5f8 Add test for container list with sparse=True 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-14 16:53:56 -07:00
Joffrey F 13609359ac Improve dockerignore comment test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-05 11:49:43 -08:00
Wanzhi Du 74586cdd4c Fix flake8 case 
Signed-off-by: Wanzhi Du <wanzhi09@gmail.com>
 2018-03-05 19:26:56 +08:00
Wanzhi Du 7a28ff3510 Ignore comment line from the .dockerignore file 
This fixed the bug that test comment line in .dockerignore file as ignore rule
bug.

Add test for "# comment" patterns in .dockerignore.

Signed-off-by: Wanzhi Du <wanzhi09@gmail.com>
 2018-03-05 18:10:09 +08:00
Yong Tang ab1f90a379 Cleanup containers during the tests 
This fix tries to clean up the containers during the tests
so that no pre-existing volumes left in docker integration tests.

This fix adds `-v` when removing containers, and makes sure
containers launched in non-daemon mode are removed.

This fix is realted to moby PR 36292

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-02-23 15:22:42 +00:00
Joffrey F ad5f49b690
Merge pull request #1918 from rycus86/service-restart-method 
Shorthand method for service.restart()
 2018-02-21 12:05:10 -08:00
Viktor Adam e54e8f4199 Shorthand method for service.force_update() 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2018-02-21 19:55:17 +00:00
Joffrey F 8fd9d3c99e GenericResources was introduced in 1.32 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-20 17:11:27 -08:00
Joffrey F 9b6b306e17 Code cleanup and version guards 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-20 16:25:17 -08:00
William Myers 820de848fa Add support for generic resources to docker.types.Resources 
- Add support for dict and list generic_resources parameter
- Add generic_resources integration test

Signed-off-by: William Myers <mwilliammyers@gmail.com>
 2018-02-20 16:25:17 -08:00
Joffrey F cc455d7fd5 Fix DockerClient pull bug when pulling image by digest 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-20 14:51:49 -08:00
Yong Tang cbbc37ac7b Clean up created volume from test_run_with_named_volume 
This fix adds the volume id to the list so that it could be
cleaned up on test teardown.

The issue was originally from https://github.com/moby/moby/pull/36292
where an additional `somevolume` pre-exists in tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-02-14 13:01:16 +00:00
Joffrey F 48e45afe88 Add support for device_cgroup_rules parameter in host config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-13 17:05:16 -08:00
Joffrey F 7fabcdaa4c Update wait to always return a dict 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-31 16:52:26 -08:00
Joffrey F df8422d079 Refuse API version < 1.21 ; Remove associated code paths 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-31 14:42:01 -08:00
Joffrey F 5347c168d0 Add support for publish mode for endpointspec ports 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-31 12:42:11 -08:00
Joffrey F ccbde11c8d Improve separation between auth_configs and general_configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-30 18:42:38 -08:00
Joffrey F e304f91b46 Update detach tests to work with AF_INET as well 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-30 17:16:23 -08:00
Fumiaki MATSUSHIMA dd858648a0 Use config.json for detachKeys 
Signed-off-by: Fumiaki Matsushima <mtsmfm@gmail.com>
 2018-01-30 17:16:23 -08:00
Joffrey F 17aa31456d Properly support pulling all tags in DockerClient.images.pull 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-30 16:47:04 -08:00
Joffrey F 3422211309 Use pytest asserts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-30 14:26:24 -08:00
Joffrey F 5728eebf79
Merge pull request #1874 from docker/1774-export-methods 
Update save / export methods to return data generators
 2018-01-29 16:19:45 -08:00
Joffrey F 388f291b13 Update save / export methods to return data generators 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 16:23:55 -08:00
Joffrey F 631cc3c121 ImageCollection.build now also returns build logs along with the built image reference 
BuildError.build_logs has a copy of the logs generator

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 15:59:46 -08:00
Joffrey F deb8222d69
Merge pull request #1873 from docker/hongbin-image-load 
Return Image objects in ImageCollection.load
 2018-01-26 14:45:09 -08:00
Joffrey F 8b5a52ae0c Error handling in ImageCollection.load 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 14:34:20 -08:00
Joffrey F 6e6eaece81 Return tuple instead of dict in exec_run 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 14:21:23 -08:00
Joffrey F b0cc4b5520 Merge branch 'add_exit_code_to_exec_run' of https://github.com/hnq90/docker-py into hnq90-add_exit_code_to_exec_run 2018-01-26 14:13:15 -08:00
Joffrey F abd60aedc7 Bump default API version to 1.35 
Add ContainerSpec.isolation support
Add until support in logs
Add condition support in wait
Add workdir support in exec_create

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 13:56:01 -08:00
Joffrey F a15a1d2fdd
Merge pull request #1856 from docker/1855-platform-option 
Add support for experimental platform flag in build and pull
 2018-01-24 18:12:50 -08:00
Joffrey F 4590e2a816
Merge pull request #1846 from feliperuhland/issue-1734-scale-method 
Added scale method to the Service model.
 2018-01-24 18:08:35 -08:00
Joffrey F ccd79323da Shift test matrix forward 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-24 11:39:43 -08:00
Joffrey F f95b958429 Add support for experimental platform flag in build and pull 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-23 16:59:09 -08:00
Viktor Adam e75a03fd6d Fix regression on API < 1.25 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2018-01-12 22:18:53 +00:00
Joffrey F bf06a361e2 Ignore dockerignore lines that contain only whitespace 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-03 12:16:21 -08:00
Felipe Ruhland 663c6089e9 Fix test to make sure the initial mode is replicated 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
 2018-01-03 00:21:56 -02:00
Felipe Ruhland 0e0a852680 Ensure that global containers are not scaled 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
 2017-12-26 18:30:28 -02:00
Felipe Ruhland edb9e3c2ae Added scale method to the Service model. 
Signed-off-by: Felipe Ruhland <felipe.ruhland@gmail.com>
 2017-12-21 23:13:18 -02:00
Joffrey F 2250fa2ebd Don't attempt to retrieve container's stderr if `auto_remove` was set 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-19 13:50:32 -08:00
Joffrey F 6b8dfe4249 Retrieve container logs before container exits / is removed 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-14 16:53:44 -08:00
Joffrey F 8cfd4cb39f
Merge pull request #1807 from rycus86/update_service_from_prev_spec 
Update service from prev spec
 2017-12-14 12:44:36 -08:00
Joffrey F 644a82542b
Merge pull request #1834 from mhank/1823-support-update-order 
Add support for order property when updating a service
 2017-12-14 12:40:20 -08:00
Viktor Adam a66c89247a Renaming new argument 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2017-12-14 09:55:36 +00:00
Joffrey F 20b5b58bb0
Merge pull request #1835 from docker/1758-url-quote-path 
Fix URL-quoting for resource names containing spaces
 2017-12-13 19:09:13 -08:00
Joffrey F 445cb18723 Add integration test for CPU realtime options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-13 19:06:29 -08:00
Joffrey F 7db76737ca Fix URL-quoting for resource names containing spaces 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-13 18:32:59 -08:00
Joffrey F aad0c76002
Merge pull request #1812 from rycus86/greedy_network_list 
Fetch network details with network lists greedily
 2017-12-13 16:33:06 -08:00
Michael Hankin 61bc8bea7f Add support for order property when updating a service 
Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
 2017-12-12 15:49:07 -06:00
Michael Hankin 8d770b012d Change format of extra hosts 
Signed-off-by: Michael Hankin <mjhankin1@gmail.com>
 2017-12-03 14:54:28 -06:00
Viktor Adam 36ed843e2b Only allow greedy queries on the model 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2017-11-21 21:59:11 +00:00
Joffrey F 58c02ca963
Merge pull request #1798 from docker/unlock_swarm_support 
Unlock swarm support
 2017-11-20 16:58:17 -08:00
Viktor Adam 2878900a71 Fixing integration tests 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2017-11-19 21:03:07 +00:00
Viktor Adam 7829b728a4 Fetch network details with network lists greedily 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2017-11-16 23:15:31 +00:00
Viktor Adam 828b865bd7 Fix resetting ContainerSpec properties to None 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2017-11-15 18:30:05 +00:00
Viktor Adam c78e73bf7a Attempting to make service update tests less flaky 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2017-11-15 08:17:16 +00:00
Viktor Adam b2d08e64bc Service model update changes 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2017-11-14 23:32:19 +00:00
Viktor Adam 6e5eb2eba7 Update service using previous spec 
Signed-off-by: Viktor Adam <rycus86@gmail.com>
 2017-11-14 21:10:23 +00:00
Sebastiaan van Stijn e6cc3c1540
Remove test_update_swarm_name 
Docker currently only supports the "default" cluster
in Swarm-mode, and an upcoming SwarmKit release
will produce an error if the name of the cluster
is updated, causing the test to fail.

Given that renaming the cluster is not supported,
this patch removes the test

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-11-14 02:47:49 +01:00
HuyNQ 436306f09d
Add exit code to exec_run 
Signed-off-by: HuyNQ <huy@huynq.net>
 2017-11-13 14:11:21 +07:00