summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix test issuesappveyorJoffrey F2017-03-295-54/+48
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add appveyor.yml configJoffrey F2017-03-281-0/+13
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add reload() in docs for Container and Secret classesJoffrey F2017-03-283-0/+15
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1528 from shin-/events_no_timeoutJoffrey F2017-03-283-6/+7
|\ | | | | Set infinite timeout for the `events` method
| * Set infinite timeout for the `events` methodJoffrey F2017-03-273-6/+7
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1524 from alex-dr/fix-apierror-statusJoffrey F2017-03-222-1/+66
|\ | | | | Fix APIError status_code property for client/server errors
| * Fix APIError status_code property for client/server errorsalex-dr2017-03-222-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #1446 from shin-/service-logsJoffrey F2017-03-215-5/+112
|\ \ | | | | | | Add service_logs command to APIClient and logs command to models.Service
| * | Remove unsupported --experimental flag from JenkinsfileJoffrey F2017-03-181-1/+1
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Use experimental engine for testing in Jenkins/MakefileJoffrey F2017-03-173-3/+6
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add service_logs integration testJoffrey F2017-03-133-4/+31
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add service_logs command to APIClient and logs command to models.ServiceJoffrey F2017-03-132-0/+77
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Bump 2.2.0, update changelogJoffrey F2017-03-212-1/+31
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1500 from shin-/fix_split_port_empty_stringJoffrey F2017-03-134-43/+48
|\ | | | | Raise an error when passing an empty string to split_port
| * Raise an error when passing an empty string to split_portJoffrey F2017-03-093-2/+5
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Move LinksTest to appropriate fileJoffrey F2017-03-092-43/+45
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1505 from AntaresS/documentation-fixJoffrey F2017-03-091-2/+2
|\ \ | |/ |/| documentation change
| * documentation changeAnda Xu2017-03-091-2/+2
| | | | | | | | Signed-off-by: Anda Xu <anda.xu@docker.com>
* | Merge pull request #1501 from max8899/fix/split_portJoffrey F2017-03-092-0/+9
|\ \ | |/ |/| fix: Missing exception handling in split_port when no container port
| * fix: Missing exception handling in split_port when no container portLei Gong2017-03-092-0/+9
|/ | | | | | | | | | "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>
* Merge pull request #1481 from shin-/system_dfJoffrey F2017-03-064-6/+34
|\ | | | | Add df method
| * Add df methodJoffrey F2017-03-014-6/+34
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1480 from shin-/bump-default-api-versionJoffrey F2017-03-062-2/+2
|\ \ | | | | | | Bump default API version to 1.26
| * | Bump default API version to 1.26Joffrey F2017-03-012-2/+2
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'tmad-container-init'Joffrey F2017-03-014-1/+44
|\ \
| * | Docstring fixes for init and init_pathJoffrey F2017-03-013-3/+6
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add init_path parameter to container HostConfigTomasz Madycki2017-03-013-1/+20
| | | | | | | | | | | | Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
| * | Add init parameter to container HostConfigTomasz Madycki2017-03-013-1/+22
|/ / | | | | | | Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
* | Merge pull request #1479 from shin-/plugin-upgradeJoffrey F2017-03-016-7/+80
|\ \ | | | | | | Add upgrade_plugin method
| * | Add Plugin.upgrade to documentationJoffrey F2017-02-231-0/+1
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add upgrade_plugin methodJoffrey F2017-02-235-7/+79
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1490 from ripcurld0/change_rm_error_msgJoffrey F2017-03-011-1/+1
|\ \ | | | | | | Update assert in test_create_with_restart_policy
| * | Update assert in test_create_with_restart_policyBoaz Shuster2017-03-011-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #1484 from BenDoan/masterJoffrey F2017-02-271-1/+1
|\ \ | |/ |/| removed unused/typoed param from models.containers.list docstring
| * removed unused/typoed param from models.containers.list docstringBen Doan2017-02-261-1/+1
|/ | | | Signed-off-by: Ben Doan <ben@bendoan.me>
* Merge pull request #1467 from crierr/masterJoffrey F2017-02-222-4/+14
|\ | | | | Allow port range like 8000-8010:80
| * passing flake8 testSeungJin Oh2017-02-201-1/+1
| | | | | | | | Signed-off-by: SeungJin Oh <crierr@naver.com>
| * check NoneType before usingSeungJin Oh2017-02-201-2/+4
| | | | | | | | Signed-off-by: SeungJin Oh <crierr@naver.com>
| * Allow port range like 8000-8010:80crierr2017-02-202-3/+11
| | | | | | | | Signed-off-by: SeungJin Oh <crierr@naver.com>
* | Merge pull request #1473 from Anvil/event-http-headersJoffrey F2017-02-212-4/+7
|\ \ | | | | | | Allow events daemon command to read config.json
| * | Fixed events command related unit tests by passing a timeout valueDamien Nadé2017-02-211-3/+6
| | | | | | | | | | | | Signed-off-by: Damien Nadé <github@livna.org>
| * | Allow events daemon command to read config.jsonDamien Nadé2017-02-211-1/+1
| | | | | | | | | | | | Signed-off-by: Damien Nadé <github@livna.org>
* | | Merge pull request #1466 from nkrabshuis/masterJoffrey F2017-02-213-5/+11
|\ \ \ | |/ / |/| | Add ability to set 'Hostname' on a Service.
| * | Flake8: Fix indent.Nils Krabshuis2017-02-191-2/+2
| | | | | | | | | | | | Signed-off-by: Nils Krabshuis <nils.krabshuis@redwood.com>
| * | Add ability to set 'Hostname' on a Service.Nils Krabshuis2017-02-193-5/+11
|/ / | | | | | | Signed-off-by: Nils Krabshuis <nils.krabshuis@redwood.com>
* | Bump dev versionJoffrey F2017-02-161-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Bump version 2.1.0Joffrey F2017-02-162-1/+52
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add missing secrets docJoffrey F2017-02-165-1/+42
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1460 from shin-/fix-cache-fromJoffrey F2017-02-163-25/+41
|\ | | | | Rename cachefrom -> cache_from
| * Rename cachefrom -> cache_fromJoffrey F2017-02-153-25/+41
| | | | | | | | | | | | | | Fix cache_from integration test Fix image ID detection in ImageCollection.build Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status