summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove use_config_proxy from exec. Add use_config_proxy docs to DockerClientproxy_env_fixesJoffrey F2019-01-096-20/+29
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2216 from thaJeztah/fix_status_code_checkJoffrey F2019-01-093-1/+25
|\ | | | | Regression 443 test: relax status-code check
| * Regression 443 test: relax status-code checkSebastiaan van Stijn2019-01-093-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-supportJoffrey F2019-01-0911-9/+292
|\ | | | | Support using proxy values from config
| * Style fixes and removed some unused code2199-proxy-supportJoffrey F2019-01-094-32/+28
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * handle url-based proxy configurationsCorentin Henry2019-01-091-2/+5
| | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * By default, disable proxy supportCorentin Henry2019-01-097-19/+45
| | | | | | | | | | | | This is to avoid a breaking change Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * fix typo in docstringCorentin Henry2019-01-091-1/+1
| | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * refactor ProxyConfigCorentin Henry2019-01-091-16/+36
| | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * code style improvementCorentin Henry2019-01-091-4/+4
| | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * Revert "make the integration tests more verbose"Corentin Henry2019-01-092-7/+7
| | | | | | | | | | | | This reverts commit 7584e5d7f068400d33d6658ae706c79db1aab2c5. Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * add integration tests for proxy supportCorentin Henry2019-01-092-0/+72
| | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * make the integration tests more verboseCorentin Henry2019-01-092-7/+7
| | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * add unit tests for ProxyConfigCorentin Henry2019-01-091-0/+84
| | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * tests: remove outdated codeCorentin Henry2019-01-091-2/+0
| | | | | | | | | | | | the _cfg attribute does not exist anymore Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * add support for proxiesCorentin Henry2019-01-095-1/+85
|/ | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
* Merge pull request #2218 from docker/fix_test_depsJoffrey F2019-01-096-14/+15
|\ | | | | Update test dependencies to latest version, fix some flake8 errors
| * Update test dependencies to latest version, fix some flake8 errorsfix_test_depsJoffrey F2019-01-096-14/+15
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2213 from docker/2210-swarm-init-returnJoffrey F2018-12-281-0/+1
|\ | | | | Make swarm.init() return value match documentation
| * Make swarm.init() return value match documentation2210-swarm-init-returnJoffrey F2018-12-281-0/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2207 from BoboTiG/patch-1Joffrey F2018-12-281-1/+1
|\ | | | | Fix DeprecationWarning: invalid escape sequence in services.py
| * Fix DeprecationWarning: invalid escape sequence in services.pyMickaël Schoentgen2018-12-201-1/+1
| | | | | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
* | Merge pull request #2208 from BoboTiG/patch-2Joffrey F2018-12-281-3/+3
|\ \ | |/ |/| Fix DeprecationWarning: invalid escape sequence in ports.py
| * Fix DeprecationWarning: invalid escape sequence in ports.pyMickaël Schoentgen2018-12-201-3/+3
|/ | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
* Merge pull request #2204 from MaxBischoff/typo-fixJoffrey F2018-12-141-1/+1
|\ | | | | Fixed a typo in the configs api doc
| * Fixed a typo in the configs api docMaximilian Bischoff2018-12-141-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-prefsJoffrey F2018-12-115-16/+49
|\ | | | | Improve handling of placement preferences and associated docs
| * Dynamically retrieve version information for generated docs2185-placement-prefsJoffrey F2018-12-071-3/+5
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Improve handling of placement preferences; improve docsJoffrey F2018-12-074-13/+44
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2198 from docker/update_versionmapJoffrey F2018-12-111-2/+5
|\ \ | |/ |/| Update Jenkinsfile version map
| * Update Jenkinsfile version mapupdate_versionmapJoffrey F2018-12-071-2/+5
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2196 from docker/2194-clean-releaseJoffrey F2018-12-071-2/+3
|\ | | | | Prevent untracked files in releases
| * Prevent untracked files in releases2194-clean-releaseJoffrey F2018-12-071-2/+3
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2193 from docker/update_setup_pyJoffrey F2018-11-302-15/+12
|\ | | | | Update setup.py for modern pypi / setuptools
| * Update setup.py for modern pypi / setuptoolsupdate_setup_pyJoffrey F2018-11-302-15/+12
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2192 from docker/authconfig_fixJoffrey F2018-11-303-4/+10
|\ | | | | Fix empty authconfig detection
| * Fix empty authconfig detectionauthconfig_fixJoffrey F2018-11-303-4/+10
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2188 from docker/c6374-credhelpersJoffrey F2018-11-309-286/+530
|\ | | | | Modernize auth management
| * Add some credHelpers testsc6374-credhelpersJoffrey F2018-11-302-52/+231
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add credstore_env to all load_config callsJoffrey F2018-11-302-3/+7
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Make AuthConfig a dict subclass for backward-compatibilityJoffrey F2018-11-302-9/+13
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Modernize auth managementJoffrey F2018-11-288-237/+294
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'little-dude-master'Joffrey F2018-11-3013-69/+371
|\ \
| * | Move exec_run example to user guides section of docsJoffrey F2018-11-305-64/+79
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Fix test namesJoffrey F2018-11-301-25/+28
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Merge branch 'master' of https://github.com/little-dude/docker-py into ↵Joffrey F2018-11-309-56/+340
| |\ \ |/ / / | | | | | | little-dude-master
| * | fix exec api inconsistencyCorentin Henry2018-11-283-5/+11
| | | | | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * | fix exec_start() documentationCorentin Henry2018-11-281-2/+2
| | | | | | | | | | | | Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
| * | tests various exec_create/exec_start combinationsCorentin Henry2018-11-281-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_socketCorentin Henry2018-11-282-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>