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

732 Commits

Author SHA1 Message Date
Joffrey F d19572aae3 Merge pull request #1493 from funkyfuture/model_properties 
Adds a few model properties
 2017-04-27 16:21:02 -07:00
Rob Kooper 5f9a599b0f Fix if replicas is set to 0, Fixes #1572 
Signed-off-by: Rob Kooper <kooper@illinois.edu>
 2017-04-26 22:50:17 -05:00
Alexey Rokhin 3f7d622143 Add cpu_count, cpu_percent, cpus parameters to container HostConfig. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-04-19 15:07:02 +03:00
Frank Sachsenheim 659090fc99 Adds an 'image' property to the container model 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2017-04-15 15:46:52 +02:00
Frank Sachsenheim b585ec59a8 Adds a 'labels' property to the image model 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2017-04-15 15:46:52 +02:00
Frank Sachsenheim 1cd56b9f0c Adds a 'labels' property to the container model 
The Docker API seems to respond with a 'null' value for the 'Labels'
attribute from containers that were created with older Docker versions.
An empty dictionary is returned in this case.

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2017-04-15 15:46:52 +02:00
Joffrey F 79edcc28f7 Add support for volume_driver in HostConfig 
Some cleanup in ContainerConfig + warning if volume_driver is provided (API>1.20)

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-05 17:05:08 -07:00
Joffrey F 73d8097b3d Fix test issues 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-29 15:39:48 -07:00
Joffrey F c5d35026ce Set infinite timeout for the `events` method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-27 15:57:36 -07:00
Joffrey F cb68acbaae Merge pull request #1524 from alex-dr/fix-apierror-status 
Fix APIError status_code property for client/server errors
 2017-03-22 15:29:23 -07:00
alex-dr e0e7404380 Fix APIError status_code property for client/server errors 
requests.Response objects evaluate as falsy when the status_code
attribute is in the 400-500 range. Therefore we are assured that
prior to this change, APIError would show `is_server_error() == False`
when generated with a 500-level response and `is_client_error() == False`
when generated with a 400-level response. This is not desirable.

Added some seemingly dry (not DRY) unit tests to ensure nothing silly
slips back in here.

Signed-off-by: alex-dr <alex@datarobot.com>
 2017-03-22 00:49:07 -04:00
Joffrey F aeb5479fd5 Use experimental engine for testing in Jenkins/Makefile 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-17 18:30:33 -07:00
Joffrey F daac15c1fa Add service_logs integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-13 17:29:04 -07:00
Joffrey F 54b3c364cb Raise an error when passing an empty string to split_port 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-09 16:12:48 -08:00
Joffrey F c2d114c067 Move LinksTest to appropriate file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-09 16:12:22 -08:00
Lei Gong eba20084f6 fix: Missing exception handling in split_port when no container port 
"localhost:host_port:" case will raise TypeError exception directly

Catch the "TypeError" and give proper error message

* docker/utils/ports.py

Signed-off-by: Lei Gong <xue177125184@gmail.com>
 2017-03-09 16:28:34 +08:00
Joffrey F fa52824363 Merge pull request #1481 from shin-/system_df 
Add df method
 2017-03-06 11:08:41 -08:00
Joffrey F 11873993eb Merge pull request #1480 from shin-/bump-default-api-version 
Bump default API version to 1.26
 2017-03-06 11:08:16 -08:00
Tomasz Madycki 8c6534d7be Add init_path parameter to container HostConfig 
Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
 2017-03-01 14:02:35 -08:00
Tomasz Madycki 13b5f785a7 Add init parameter to container HostConfig 
Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
 2017-03-01 14:02:35 -08:00
Joffrey F d59b6b99cc Merge pull request #1479 from shin-/plugin-upgrade 
Add upgrade_plugin method
 2017-03-01 13:52:46 -08:00
Joffrey F 4273d3f63d Bump default API version to 1.26 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-01 13:52:07 -08:00
Joffrey F cfb14fa78f Add df method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-01 13:51:39 -08:00
Boaz Shuster 5dced6579a Update assert in test_create_with_restart_policy 
In https://github.com/docker/docker/pull/30870 a new
error message is displayed if the container is restarting.

To make "test_create_with_restart_policy" pass against the
above change, the test checks that the error message contains
"You cannot remove " instead of
"You cannot remove a running container"

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-01 15:36:32 +02:00
Joffrey F 48ac772994 Add upgrade_plugin method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-23 17:27:04 -08:00
Joffrey F f387ae46d7 Merge pull request #1467 from crierr/master 
Allow port range like 8000-8010:80
 2017-02-22 15:27:42 -08:00
Joffrey F f9f77c4c2f Merge pull request #1473 from Anvil/event-http-headers 
Allow events daemon command to read config.json
 2017-02-21 12:11:58 -08:00
Damien Nadé f36ef399ad Fixed events command related unit tests by passing a timeout value 
Signed-off-by: Damien Nadé <github@livna.org>
 2017-02-21 18:21:10 +01:00
crierr cfc11515bc Allow port range like 8000-8010:80 
Signed-off-by: SeungJin Oh <crierr@naver.com>
 2017-02-20 02:09:33 +09:00
Nils Krabshuis 44c31e47e0 Add ability to set 'Hostname' on a Service. 
Signed-off-by: Nils Krabshuis <nils.krabshuis@redwood.com>
 2017-02-19 06:18:26 +01:00
Joffrey F e0b6cdfcf6 Merge pull request #1460 from shin-/fix-cache-from 
Rename cachefrom -> cache_from
 2017-02-16 13:35:58 -08:00
Joffrey F 0a97df1abc Rename cachefrom -> cache_from 
Fix cache_from integration test
Fix image ID detection in ImageCollection.build

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-15 19:13:24 -08:00
Joffrey F 3a9c83509c Add xfail mark to storageopt test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-15 19:02:31 -08:00
Joffrey F 4a50784ad4 Merge pull request #1459 from shin-/1300-storageopts 
Add support for storage_opt in host_config
 2017-02-15 18:12:31 -08:00
Joffrey F afcbeb5e4f Merge pull request #1449 from shin-/secrets-api 
Implement secrets API
 2017-02-15 18:08:25 -08:00
Joffrey F ece3b19782 Add support for storage_opt in host_config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-15 17:43:24 -08:00
Joffrey F 20c6fe31e0 Add support for recursive wildcard pattern in .dockerignore 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-14 18:29:37 -08:00
Joffrey F e8a86e40cc Add tests for secret API implementation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-13 17:06:25 -08:00
Joffrey F 35f37a0936 Merge pull request #1432 from shin-/plugins 
Plugins API
 2017-02-13 13:20:53 -08:00
Joffrey F e1ad3186ef Add create_plugin implementation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-09 17:58:05 -08:00
Ben Firshman f83993de0a
Fix passing volumes to run with no host path 
Technically we shouldn't be passing them as binds, but the daemon
doesn't seem to mind.

Fixes #1380

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2017-02-07 19:22:36 +01:00
Ben Firshman 956fe1cac1
Fix volume path passed by run to create_container 
Seems like this is pretty much ignored by Docker, so it wasn't
causing any visible issues, except when a volume name was used
instead of a path.

Also, added integration tests.

Ref #1380

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2017-02-07 19:22:35 +01:00
Joffrey F 42b9358458 Merge pull request #1425 from shin-/prunes 
Prunes
 2017-02-03 19:49:54 -08:00
Joffrey F 9296971e4c APIClient implementation of plugin methods 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-03 19:45:59 -08:00
Joffrey F b3ea1fb942 Merge pull request #1429 from shin-/fix_remove_network_test 
Improve robustness of remove_network integration test
 2017-01-30 19:13:22 -08:00
Joffrey F 83b45b7d54 Add prune_networks method 
Ensure all integration tests use the same version of the busybox image

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 18:54:18 -08:00
Joffrey F 89d3803344 Add prune_volumes method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 18:53:46 -08:00
Joffrey F 7f0c2e7531 Add prune_images method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 18:53:46 -08:00
Joffrey F f2a867f04b Add prune_containers method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 18:53:46 -08:00
Joffrey F bf41c7fa67 Improve robustness of remove_network integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-30 18:52:11 -08:00
Joffrey F 08aac9d571 Merge pull request #1341 from pacoxu/patch-1 
Scope is added in volume after docker 1.12
 2017-01-30 11:59:00 -08:00
Joffrey F d22e2fec6f Add support for force_update in TaskTemplate 
Add min version checks in create_service and update_service

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-27 17:19:18 -08:00
Joffrey F fc5cd1a914 Add support for max_failure_ratio and monitor in UpdateConfig 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-27 16:40:05 -08:00
Joffrey F 847f209865 Add stop_timeout to create_container 
Fix requires_api_version test decorator

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-27 16:00:18 -08:00
Joffrey F 0186456f3c Merge pull request #1413 from docker/force_remove_volume 
Add 'force' parameter in remove_volume
 2017-01-26 14:40:00 -08:00
Joffrey F 2d93674903 Merge pull request #1419 from docker/remove_obsolete_search_test 
Remove integration test for APIClient.search method
 2017-01-26 14:34:10 -08:00
Joffrey F a24b114af3 Add 'force' parameter in remove_volume 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-26 14:24:52 -08:00
Joffrey F 64519a2b20 Merge pull request #1415 from docker/autoremove_support 
Add support for auto_remove in HostConfig
 2017-01-26 14:24:23 -08:00
Joffrey F 62c94f9634 Remove integration test for APIClient.search method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-26 14:07:41 -08:00
Thomas Schaaf 686d8e9536
Implement cachefrom 
Signed-off-by: Thomas Schaaf <schaaf@komola.de>
 2017-01-26 11:20:01 +00:00
Joffrey F a1d550a14c Allow configuring API version for integration test with env var 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-25 16:52:26 -08:00
Joffrey F 848b7aa6a4 Add support for auto_remove in HostConfig 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-25 16:45:59 -08:00
Joffrey F 3e5bb7b0e6 Fix Swarm model init to correctly pass arguments through to init_swarm 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-25 15:28:43 -08:00
Joffrey F e87ed38f69 Ignore socket files in utils.tar 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-24 18:00:42 -08:00
Joffrey F 06e8081799 Convert mode argument to valid structure in create_service 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-19 16:23:32 -08:00
Joffrey F bb665257ed Merge pull request #1393 from aebm/master 
Fix #1351
 2017-01-19 11:55:14 -08:00
Ben Firshman 468bb1c545 Merge pull request #1347 from fcurella/hash 
Make resources hashable, so that they can be added to `set`s
 2017-01-18 16:49:35 +01:00
Alejandro E. Brito Monedero 95b6fddd14 Fix #1351 
* 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>
 2017-01-16 08:48:41 +01:00
Joffrey F 40089a781c Detect mount type in parse_mount_string 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 15:13:09 -08:00
Joffrey F a960731999 Additional parse_mount_string tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 14:33:58 -08:00
Joffrey F 155b95d143 Merge branch 'dz-fix-mount_options' of https://github.com/dzimine/docker-py into dzimine-dz-fix-mount_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 14:19:25 -08:00
Joffrey F 9450442c8c Accept / as a path separator in dockerignore patterns on all platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-06 16:37:15 -08:00
Dmitri 59ccd8a782 Fix readonly in mounts. 
Signed-off-by: Dmitri Zimine dz@stackstorm.com
 2016-12-28 23:43:15 -08:00
Joffrey F 48c5cd82fc Prevent Swarm address conflicts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-08 14:50:05 -08:00
Flavio Curella 6f239fbf29 Make resources hashable, so that they can be added to `set`s 
Signed-off-by: Flavio Curella <flavio.curella@gmail.com>
 2016-12-08 12:19:30 -06:00
徐俊杰 b9c48dca2c Scope is added in volume after docker 1.12 
Signed-off-by: pacoxu <paco.xu@daocloud.io>

add ut test for volume scope and no specified name create
Signed-off-by: Paco Xu <paco.xu@daocloud.io>

try to fix ut failure of volume creation
Signed-off-by: Paco Xu <paco.xu@daocloud.io>

try to fix ut failure of volume creation
Signed-off-by: Paco Xu <paco.xu@daocloud.io>

Scope is added in volume after docker 1.12
 Signed-off-by: pacoxu <paco.xu@daocloud.io>

Scope is added in volume after docker 1.12
 Signed-off-by: pacoxu <paco.xu@daocloud.io>
 2016-12-08 10:31:44 +08:00
Joffrey F d024b1bd78 Merge pull request #1338 from docker/remove_node 
Implement swarm node removal
 2016-12-07 15:37:17 -08:00
Joffrey F 738cfdcdf9 Update code and tests for Engine 1.13 compatibility 
Makefile now runs tests against Docker 1.13 RC

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-07 14:51:14 -08:00
Joffrey F c239e40504 Implement swarm node removal 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-07 12:24:18 -08:00
Joffrey F b71f34e948 Fix typo in create_network 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-06 11:26:53 -08:00
Daniel Nephin 2b85fbf120 Add attachable. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2016-12-05 17:54:18 -05:00
Ben Firshman dd8ad21c88 Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-start 
exec: fix running with detach=True
 2016-12-05 11:00:10 +00:00
Joffrey F c02493cf18 Merge pull request #1331 from aanand/fix-auth-config-path-windows 
Fix auth config path on Windows
 2016-12-02 18:07:08 -08:00
Joffrey F d56b2d3dc8 Merge pull request #1315 from bfirsh/rename-docker-py-to-docker-sdk-python 
Start to rename docker-py to docker-sdk-python
 2016-12-02 15:20:34 -08:00
Joffrey F 32cd0161b6 Merge pull request #1330 from docker/walkerlee-master 
Add options to IPAMConfig
 2016-12-02 15:18:41 -08:00
Joffrey F fd4c01aa99 Merge branch 'master' of https://github.com/walkerlee/docker-py into walkerlee-master 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-02 14:57:57 -08:00
Joffrey F 88b733b0f4 Merge branch 'patch-1' of https://github.com/manics/docker-py into manics-patch-1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-02 14:50:40 -08:00
Aanand Prasad fb4969f744 Fix auth config path on Windows 
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>
 2016-12-02 18:02:09 +00:00
Ben Firshman dfa4b76989 Merge pull request #1328 from docker/ssladapter_transport_module 
Move ssladapter to transport module
 2016-12-02 14:44:03 +00:00
Joffrey F 4539644667 Move ssladapter to transport module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-01 18:04:40 -08:00
Joffrey F 01c33c0f68 Client -> DockerClient 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-01 18:02:16 -08:00
Joffrey F 993f298e85 Move config type creation from docker.utils functions to classes in 
docker.types

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-01 16:06:41 -08:00
Ben Firshman e7d78d10f6 Merge pull request #1303 from aanand/helpful-containers-warning 
Show a helpful warning when people try to call `client.containers()`
 2016-12-01 11:11:46 +00:00
Joffrey F 239673a51c Merge pull request #1308 from docker/docker_client 
Rename Client -> DockerClient
 2016-11-30 15:30:40 -08:00
Tomas Tomecek 515db1f6fd exec: fix running with detach=True 
Fixes #1271

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-11-29 16:04:52 +01:00
Ben Firshman 6a16edee3e Merge pull request #1277 from bodnarbm/do-not-traverse-ignored-directories-with-no-potential-exceptions 
Do not traverse excluded directories that are not prefixes of dockerignore exceptions.
 2016-11-29 10:09:43 +00:00
Joffrey F f5ac10c469 Rename Client -> DockerClient 
Replace references to old Client with APIClient
Moved contents of services.md to appropriate locations

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-28 15:28:04 -08:00
Joffrey F 9643253c50 Merge pull request #1297 from docker/stepanstipl-allow_custom_pid_mode 
Allow custom pid mode
 2016-11-28 14:00:07 -08:00
Joffrey F 75e9d357f7 Merge pull request #1309 from bfirsh/remove-maintainer-from-dockerfiles 
Remove MAINTAINER from Dockerfiles
 2016-11-28 13:14:40 -08:00
Joffrey F 4e08a5cb9e Merge pull request #1317 from bfirsh/fix-environment-variable-file-with-new-lines 
Fix parsing for an environment file with newlines
 2016-11-28 12:06:38 -08:00