Commit Graph

674 Commits

Author SHA1 Message Date
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