Commit Graph

2065 Commits

Author SHA1 Message Date
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
Frank Sachsenheim 6529fa599c Makes docs builds faster and ensures proper ownership
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
Joffrey F f127a9ffdc Merge pull request #1558 from shin-/sanimej-verbose
Add 'verbose' option for network inspect API
2017-04-11 16:25:14 -07:00
Joffrey F e506a2b8ea Standardize handling of verbose param in inspect_network
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-10 16:03:13 -07:00
Santhosh Manohar abd5370d87 Add 'verbose' option for network inspect api
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2017-04-10 16:03:13 -07:00
Joffrey F ffc3769920 Merge pull request #1557 from ewanbarr/patch-1
Minor typo correction
2017-04-10 12:14:33 -07:00
ewanbarr 112dc12bc0 Minor typo correction
The stdout argument name was repeated in the run method docstring. The second should be replaced by stderr.

Signed-off-by: Ewan Barr <ewan.d.barr@googlmail.com>
2017-04-08 14:20:45 +02:00
Joffrey F f8609c7462 Merge pull request #1554 from peter-slovak/fix-docs-container-cpu-opts
Fix docs container cpu opts
2017-04-06 16:18:14 -07:00
Joffrey F 19ef2ddccb Merge pull request #1547 from shin-/1543-volume-driver-moved
Add support for volume_driver in HostConfig
2017-04-06 16:11:23 -07:00
Peter Slovak c80762d376 removed duplicate mem_limit arg desc; type now consistent accross models (float->int)
Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>
2017-04-07 00:38:14 +02:00
Peter Slovak 1f609208fd docs renames: cpu_group->cpu_period, cpu_period->cpu_quota
Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>
2017-04-07 00:37:45 +02:00
Joffrey F 3076a9ac40 2.3.0-dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-05 17:07:43 -07: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 d12b5bb5e6 Merge pull request #1544 from shin-/1522-default_api_version_docs
Update mentions of the default API version in docs
2017-04-04 11:42:33 -07:00
Joffrey F eea1271cd0 Update mentions of the default API version in docs
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-03 16:45:09 -07:00
Joffrey F 62a49196a0 Merge pull request #1540 from docker/appveyor
Add appveyor to CI suite to run unit tests on Windows
2017-03-29 15:55:13 -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 856971ed51 Merge pull request #1537 from shin-/add-integration-test-target
Add 17.04 (CE) RC1 to list of engine versions to be tested
2017-03-29 15:30:51 -07:00
Joffrey F 7fa30a713e Add appveyor.yml config
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 16:29:41 -07:00
Joffrey F 09813334c1 Add 17.04 (CE) RC1 to list of engine versions to be tested
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 16:22:35 -07:00
Joffrey F 277a6e13c2 Add reload() in docs for Container and Secret classes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 16:00:29 -07:00
Joffrey F c0c25c07ca Merge pull request #1528 from shin-/events_no_timeout
Set infinite timeout for the `events` method
2017-03-28 12:06:37 -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 3d8b20a906 Merge pull request #1446 from shin-/service-logs
Add service_logs command to APIClient and logs command to models.Service
2017-03-21 13:57:25 -07:00
Joffrey F 04c662bd23 Bump 2.2.0, update changelog
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-21 12:33:45 -07:00
Joffrey F b7fbbb56c7 Remove unsupported --experimental flag from Jenkinsfile
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-18 15:20:20 -07: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 be463bb27e Add service_logs command to APIClient and logs command to models.Service
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 16:55:30 -07:00
Joffrey F 24f75ea212 Merge pull request #1500 from shin-/fix_split_port_empty_string
Raise an error when passing an empty string to split_port
2017-03-13 11:59:52 -07:00
Joffrey F 4011fa7d5c Merge pull request #1505 from AntaresS/documentation-fix
documentation change
2017-03-09 16:17:43 -08: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
Joffrey F 12f1a6957e Merge pull request #1501 from max8899/fix/split_port
fix: Missing exception handling in split_port when no container port
2017-03-09 16:11:53 -08:00
Anda Xu eb91d709cb documentation change
Signed-off-by: Anda Xu <anda.xu@docker.com>
2017-03-09 13:53:43 -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
Joffrey F 830b9edce8 Merge branch 'tmad-container-init' 2017-03-01 14:02:50 -08:00
Joffrey F c0c3cb4497 Docstring fixes for init and init_path
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 14:02:35 -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
Joffrey F 4a08d04aef Merge pull request #1490 from ripcurld0/change_rm_error_msg
Update assert in test_create_with_restart_policy
2017-03-01 11:54:13 -08:00