Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove use_config_proxy from exec. Add use_config_proxy docs to DockerClientproxy_env_fixes | Joffrey F | 2019-01-09 | 6 | -20/+29 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #2216 from thaJeztah/fix_status_code_check | Joffrey F | 2019-01-09 | 3 | -1/+25 |
|\ | | | | | Regression 443 test: relax status-code check | ||||
| * | Regression 443 test: relax status-code check | Sebastiaan van Stijn | 2019-01-09 | 3 | -1/+25 |
|/ | | | | | | | | | | | 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> | ||||
* | Merge pull request #2219 from docker/2199-proxy-support | Joffrey F | 2019-01-09 | 11 | -9/+292 |
|\ | | | | | Support using proxy values from config | ||||
| * | Style fixes and removed some unused code2199-proxy-support | Joffrey F | 2019-01-09 | 4 | -32/+28 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | handle url-based proxy configurations | Corentin Henry | 2019-01-09 | 1 | -2/+5 |
| | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | By default, disable proxy support | Corentin Henry | 2019-01-09 | 7 | -19/+45 |
| | | | | | | | | | | | | This is to avoid a breaking change Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | fix typo in docstring | Corentin Henry | 2019-01-09 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | refactor ProxyConfig | Corentin Henry | 2019-01-09 | 1 | -16/+36 |
| | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | code style improvement | Corentin Henry | 2019-01-09 | 1 | -4/+4 |
| | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | Revert "make the integration tests more verbose" | Corentin Henry | 2019-01-09 | 2 | -7/+7 |
| | | | | | | | | | | | | This reverts commit 7584e5d7f068400d33d6658ae706c79db1aab2c5. Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | add integration tests for proxy support | Corentin Henry | 2019-01-09 | 2 | -0/+72 |
| | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | make the integration tests more verbose | Corentin Henry | 2019-01-09 | 2 | -7/+7 |
| | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | add unit tests for ProxyConfig | Corentin Henry | 2019-01-09 | 1 | -0/+84 |
| | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | tests: remove outdated code | Corentin Henry | 2019-01-09 | 1 | -2/+0 |
| | | | | | | | | | | | | the _cfg attribute does not exist anymore Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | add support for proxies | Corentin Henry | 2019-01-09 | 5 | -1/+85 |
|/ | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
* | Merge pull request #2218 from docker/fix_test_deps | Joffrey F | 2019-01-09 | 6 | -14/+15 |
|\ | | | | | Update test dependencies to latest version, fix some flake8 errors | ||||
| * | Update test dependencies to latest version, fix some flake8 errorsfix_test_deps | Joffrey F | 2019-01-09 | 6 | -14/+15 |
|/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #2213 from docker/2210-swarm-init-return | Joffrey F | 2018-12-28 | 1 | -0/+1 |
|\ | | | | | Make swarm.init() return value match documentation | ||||
| * | Make swarm.init() return value match documentation2210-swarm-init-return | Joffrey F | 2018-12-28 | 1 | -0/+1 |
|/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #2207 from BoboTiG/patch-1 | Joffrey F | 2018-12-28 | 1 | -1/+1 |
|\ | | | | | Fix DeprecationWarning: invalid escape sequence in services.py | ||||
| * | Fix DeprecationWarning: invalid escape sequence in services.py | Mickaël Schoentgen | 2018-12-20 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> | ||||
* | | Merge pull request #2208 from BoboTiG/patch-2 | Joffrey F | 2018-12-28 | 1 | -3/+3 |
|\ \ | |/ |/| | Fix DeprecationWarning: invalid escape sequence in ports.py | ||||
| * | Fix DeprecationWarning: invalid escape sequence in ports.py | Mickaël Schoentgen | 2018-12-20 | 1 | -3/+3 |
|/ | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> | ||||
* | Merge pull request #2204 from MaxBischoff/typo-fix | Joffrey F | 2018-12-14 | 1 | -1/+1 |
|\ | | | | | Fixed a typo in the configs api doc | ||||
| * | Fixed a typo in the configs api doc | Maximilian Bischoff | 2018-12-14 | 1 | -1/+1 |
|/ | | | | | | | The documentation for id in ConfigApiMixin inspect_config was wrongly mentioning removal of a config Signed-off-by: Maximilian Bischoff <maximilianbischoff2@gmail.com> | ||||
* | Merge pull request #2197 from docker/2185-placement-prefs | Joffrey F | 2018-12-11 | 5 | -16/+49 |
|\ | | | | | Improve handling of placement preferences and associated docs | ||||
| * | Dynamically retrieve version information for generated docs2185-placement-prefs | Joffrey F | 2018-12-07 | 1 | -3/+5 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Improve handling of placement preferences; improve docs | Joffrey F | 2018-12-07 | 4 | -13/+44 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge pull request #2198 from docker/update_versionmap | Joffrey F | 2018-12-11 | 1 | -2/+5 |
|\ \ | |/ |/| | Update Jenkinsfile version map | ||||
| * | Update Jenkinsfile version mapupdate_versionmap | Joffrey F | 2018-12-07 | 1 | -2/+5 |
|/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #2196 from docker/2194-clean-release | Joffrey F | 2018-12-07 | 1 | -2/+3 |
|\ | | | | | Prevent untracked files in releases | ||||
| * | Prevent untracked files in releases2194-clean-release | Joffrey F | 2018-12-07 | 1 | -2/+3 |
|/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #2193 from docker/update_setup_py | Joffrey F | 2018-11-30 | 2 | -15/+12 |
|\ | | | | | Update setup.py for modern pypi / setuptools | ||||
| * | Update setup.py for modern pypi / setuptoolsupdate_setup_py | Joffrey F | 2018-11-30 | 2 | -15/+12 |
|/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #2192 from docker/authconfig_fix | Joffrey F | 2018-11-30 | 3 | -4/+10 |
|\ | | | | | Fix empty authconfig detection | ||||
| * | Fix empty authconfig detectionauthconfig_fix | Joffrey F | 2018-11-30 | 3 | -4/+10 |
|/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #2188 from docker/c6374-credhelpers | Joffrey F | 2018-11-30 | 9 | -286/+530 |
|\ | | | | | Modernize auth management | ||||
| * | Add some credHelpers testsc6374-credhelpers | Joffrey F | 2018-11-30 | 2 | -52/+231 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Add credstore_env to all load_config calls | Joffrey F | 2018-11-30 | 2 | -3/+7 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Make AuthConfig a dict subclass for backward-compatibility | Joffrey F | 2018-11-30 | 2 | -9/+13 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Modernize auth management | Joffrey F | 2018-11-28 | 8 | -237/+294 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge branch 'little-dude-master' | Joffrey F | 2018-11-30 | 13 | -69/+371 |
|\ \ | |||||
| * | | Move exec_run example to user guides section of docs | Joffrey F | 2018-11-30 | 5 | -64/+79 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Fix test names | Joffrey F | 2018-11-30 | 1 | -25/+28 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge branch 'master' of https://github.com/little-dude/docker-py into ↵ | Joffrey F | 2018-11-30 | 9 | -56/+340 |
| |\ \ |/ / / | | | | | | | little-dude-master | ||||
| * | | fix exec api inconsistency | Corentin Henry | 2018-11-28 | 3 | -5/+11 |
| | | | | | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | | fix exec_start() documentation | Corentin Henry | 2018-11-28 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | | tests various exec_create/exec_start combinations | Corentin Henry | 2018-11-28 | 1 | -0/+69 |
| | | | | | | | | | | | | | | | | | | Test the interation of the tty, demux and stream parameters Signed-off-by: Corentin Henry <corentinhenry@gmail.com> | ||||
| * | | add tests for _read_from_socket | Corentin Henry | 2018-11-28 | 2 | -23/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the return value against the various combination of parameters this function can take (tty, stream, and demux). This commit also fixes a bug that the tests uncovered a bug in consume_socket_output. Signed-off-by: Corentin Henry <corentinhenry@gmail.com> |