summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix dockerignore exclusion logic on Windowswin32-test-fixesJoffrey F2016-10-142-2/+8
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Update tests to avoid failures on Windows platformsJoffrey F2016-10-149-102/+141
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1254 from docker/npipe-advancedJoffrey F2016-10-145-4/+45
|\ | | | | Several fixes to npipe support
| * Several fixes to npipe supportnpipe-advancedJoffrey F2016-10-125-3/+44
| | | | | | | | | | | | | | | | | | - Fix _get_raw_response_socket to always return the NpipeSocket object - Override NpipeHTTPConnectionPool._get_conn to avoid crash in urllib3 - Fix NpipeSocket.recv_into for Python 2 - Do not call select() on NpipeSocket objects Signed-off-by: Joffrey F <joffrey@docker.com>
| * Do not allow bufsize to be 0 in NpipeSocket.makefile()1251-strictly-positive-bufsizeJoffrey F2016-10-111-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1256 from docker/format_env_unicode_bugJoffrey F2016-10-132-2/+20
|\ \ | | | | | | Do not break when calling format_environment with unicode values
| * | Do not break when calling format_environment with unicode valuesformat_env_unicode_bugJoffrey F2016-10-122-2/+20
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1255 from docker/base_url_trailing_slashJoffrey F2016-10-132-2/+7
|\ \ | | | | | | Remove trailing slashes in result of utils.parse_host
| * | Remove trailing slashes in result of utils.parse_hostbase_url_trailing_slashJoffrey F2016-10-122-2/+7
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1257 from bfirsh/remove-dead-codeJoffrey F2016-10-131-3/+0
|\ \ | |/ |/| Remove dead code in import_image_from_data
| * Remove dead code in import_image_from_dataBen Firshman2016-10-131-3/+0
|/ | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Merge pull request #1248 from docker/setup-py-fixesJoffrey F2016-10-051-0/+12
|\ | | | | Add missing long_description and maintainer fields to setup.py
| * Add missing long_description and maintainer fields to setup.pysetup-py-fixesJoffrey F2016-10-051-0/+12
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1243 from mattjegan/masterJoffrey F2016-10-051-1/+1
|\ | | | | Fix syntax in README required by RST
| * Fix syntax in README required by RSTmattjegan2016-10-041-1/+1
| | | | | | | | Before the readme is converted to rst it required an extra character to convert with no errors. Signed-off-by: Matthew Egan <matthewj.egan@hotmail.com>
* | Merge pull request #1226 from TomasTomecek/remove-ipaddress-depJoffrey F2016-10-051-0/+3
|\ \ | | | | | | document ipaddress dependency
| * | document requirement for ipaddress moduleTomas Tomecek2016-10-051-0/+3
| | | | | | | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | Merge branch 'api-docs-update'Joffrey F2016-10-051-27/+23
|\ \ \
| * \ \ Merge branch 'TomasTomecek-improve-version-mismatcj'Joffrey F2016-10-051-0/+24
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'TomasTomecek-improve-version-mismatcj'Joffrey F2016-10-051-0/+28
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Removed non-existent FAQ page from mkdocs.ymlJoffrey F2016-10-051-1/+0
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | document how to recover from api version mismatchTomas Tomecek2016-10-052-0/+29
|/ / | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | Update adapters to use pool_connections instead of num_poolsJoffrey F2016-10-043-6/+6
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | fix for got an unexpected keyword argument 'num_pools'Pierre Tardy2016-10-041-1/+1
|/ | | | | | requests's HTTPAdapter API is pool_connections for number of connection of the pool Signed-off-by: Pierre Tardy <tardyp@gmail.com>
* Merge pull request #1217 from bfirsh/reorganisation-base-testsJoffrey F2016-10-0319-203/+182
|\ | | | | Move BaseTestCase to BaseIntegrationTest
| * Move requires_api_version to helpersBen Firshman2016-10-0311-37/+35
| | | | | | | | | | | | | | Because it's a helper, not a base thing. In preparation for moving/deleting the unit test base classes. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Move BaseTestCase to BaseIntegrationTestBen Firshman2016-10-0314-168/+147
| | | | | | | | | | | | | | | | Because two things called `BaseTestCase` is quite confusing. I haven't bothered refactoring the other `BaseTestCase` because that disappears anyway when we drop Python 2.6 support. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Add timeout to from_envBen Firshman2016-10-031-1/+3
|/ | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Merge pull request #1224 from mferon/addRestartPolicyUpdateSupportJoffrey F2016-09-293-1/+40
|\ | | | | Add support for restart policy update
| * Add support for restart policy updateMaxime Feron2016-09-283-1/+40
| | | | | | | | Signed-off-by: Maxime Feron <maxime.feron@corp.ovh.com>
* | Merge pull request #1232 from pacoxu/typo_pacoJoffrey F2016-09-291-1/+1
|\ \ | | | | | | replace on_failure with on-failure
| * | replace on_failure with on-failure徐俊杰2016-09-291-1/+1
| |/ | | | | | | | | Signed-off-by: 徐俊杰<roollingstone@gmail.com> Signed-off-by: XuPaco <roollingstone@gmail.com>
* | Merge pull request #1234 from aboch/ipJoffrey F2016-09-291-5/+4
|\ \ | |/ |/| Adjust test_create_network_with_ipam_config
| * Adjust test_create_network_with_ipam_configAlessandro Boch2016-09-291-5/+4
|/ | | | | | | - to account for API change: IPAM class will now also include a Data class, besides Config. Signed-off-by: Alessandro Boch <aboch@docker.com>
* Merge pull request #1228 from christianbundy/synthesize-execute-bitJoffrey F2016-09-271-1/+16
|\ | | | | Synthesize execute permission bit
| * Pass file object to Tarfile.addfile()Christian Bundy2016-09-271-1/+12
| | | | | | | | | | | | | | | | | | | | This resolves an issue where TarFile.gettarinfo() doesn't include the file object, meaning that TarFile.addfile(TarFile.gettarinfo()) doesn't pass the test suite. Instead, this uses an open() within a try...except block to include a file object for each file without passing a file object when the path is a directory. Signed-off-by: Christian Bundy <christianbundy@fraction.io>
| * Synthesize executable bit on WindowsSebastian Schwarz2016-09-271-1/+5
|/ | | | | | | | | | | The build context is tarred up on the client and then sent to the Docker daemon. However Windows permissions don't match the Unix ones. Therefore we have to mark all files as executable when creating a build context on Windows, like `docker build` already does: https://github.com/docker/docker/issues/11047. Signed-off-by: Sebastian Schwarz <seschwar@gmail.com>
* Merge branch 'release'Joffrey F2016-09-194-3/+42
|\
| * Merge pull request #1220 from docker/1.10.3-release1.10.3Joffrey F2016-09-168-18/+86
| |\ | | | | | | 1.10.3 release
| | * Number of pools in adapter is configurable1.10.3-releaseJoffrey F2016-09-164-15/+31
| | | | | | | | | | | | | | | | | | Default increased from 10 to 25 Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Add support for identity tokens in config file.Joffrey F2016-09-162-2/+37
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Bump versionJoffrey F2016-09-162-1/+18
| |/ | | | | | | | | | | Update Changelog Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge pull request #1202 from docker/1.10.2-release1.10.2Joffrey F2016-09-114-3/+14
| |\ | | | | | | 1.10.2 release
| | * Bump docker-pycreds dependency ; bump patch numberJoffrey F2016-09-114-3/+14
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge pull request #1198 from docker/1.10.1-release1.10.1Joffrey F2016-09-094-2/+20
| |\ | | | | | | 1.10.1 release
| | * Re-add docker.utils.types module for backwards compatibility1.10.1-releaseJoffrey F2016-09-091-0/+7
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Bump version + Update ChangelogJoffrey F2016-09-093-2/+13
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1210 from docker/identity-token-supportJoffrey F2016-09-162-2/+37
|\ \ | | | | | | Add support for identity tokens in config file
| * | Add support for identity tokens in config file.identity-token-supportJoffrey F2016-09-152-2/+37
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1215 from bfirsh/autopep8Joffrey F2016-09-1411-12/+17
|\ \ \ | | | | | | | | Fix a few pep8 issues
View Lorry Controller Status