summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump default API version to 1.21bump_api_version_121Joffrey F2015-11-043-17/+20
| | | | | | | Update Makefile to run tests against dind 1.9.0 Update network tests to account for latest API changes Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #830 from docker/fix-links-create-testJoffrey F2015-10-281-1/+1
|\ | | | | Use network_mode=bridge when testing links
| * Use network_mode=bridge when testing linksJoffrey F2015-10-281-1/+1
| | | | | | | | | | | | | | | | Links are only compatible with network mode bridge. New versions of docker only create env entries when network mode is properly set. Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #827 from coreypobrien/lessbindingJoffrey F2015-10-281-45/+53
|\ \ | |/ |/| Move container volume bind tests to their own class
| * Move container volume bind tests to their own classCorey O'Brien2015-10-271-45/+53
| | | | | | | | Signed-off-by: Corey O'Brien <coreypobrien@gmail.com>
* | Fix py3.2 test failure and unicode behaviorJoffrey F2015-10-272-6/+10
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #825 from aebm/masterJoffrey F2015-10-272-1/+30
|\ | | | | Fix auth.load_config bug calling parse_auth
| * Fix auth.load_config bug calling parse_authAlejandro Brito Monedero2015-10-272-1/+30
| | | | | | | | | | | | | | | | | | When load_config found and auths section it didn't call parse_auth only with the auths section. Instead it called parse_auth with all the configuration. There is also a test to check this case Signed-off-by: Alejandro Brito Monedero <alejandro.monedero@gmail.com>
* | Merge pull request #824 from dnephin/fix_unicode_commandsJoffrey F2015-10-274-7/+24
|\ \ | |/ |/| Support unicode commands
| * Support unicode commands.Daniel Nephin2015-10-264-7/+24
|/ | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* Merge pull request #809 from docker/reorganize_testsJoffrey F2015-10-2128-3713/+3731
|\ | | | | Reorganize tests
| * Reorganize test directoriesreorganize_testsJoffrey F2015-10-2128-3713/+3731
|/ | | | | | | | More clearly separate unit and integration tests Allow splitting into multiple files Cleaner Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #820 from docker/819-volumes-createJoffrey F2015-10-213-4/+4
|\ | | | | Update `Client.create_volume` to use new endpoint
| * Update `Client.create_volume` to use new endpoint819-volumes-createJoffrey F2015-10-213-4/+4
|/ | | | | | | | New API endpoint is POST /volumes/create (previously just /volumes) Since the feature is yet unreleased (RC), no fallback strategy is implemented. Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #812 from docker/811-unix-adapterJoffrey F2015-10-211-3/+11
|\ | | | | Fix Unix adapter bug with newer versions of requests
| * Fix Unix adapter bug with newer versions of requests811-unix-adapterJoffrey F2015-10-191-3/+11
|/ | | | | | | | | The select_proxy utility in requests errors out when the provided URL doesn't have a hostname, like is the case when using a UNIX socket. Since proxies are an irrelevant notion in the case of UNIX sockets anyway, we simply return the path URL directly. Signed-off-by: Joffrey F <joffrey@docker.com>
* Back to dev versionJoffrey F2015-10-191-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #808 from alasdairnicol/docs_examplesDaniel Nephin2015-10-156-26/+26
|\ | | | | Docs examples
| * Tidied up code examples in docsAlasdair Nicol2015-10-146-26/+26
| | | | | | | | | | | | | | | | * Use `cli = Client` everywhere * Use Client.create_host_config method * Added missing '>'s Signed-off-by: Alasdair Nicol <alasdair@thenicols.net>
* | Pull correct version of busybox in integration testsJoffrey F2015-10-141-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'delfick-patch-1'Joffrey F2015-10-145-12/+123
|\ \ | |/ |/|
| * Fix attach method over SSL connectionsStephen Moore2015-10-145-12/+123
| | | | | | | | Signed-off-by: Stephen Moore <stephen@delfick.com>
| * Use DOCKER_CONFIG environment variable to look up auth configJoffrey F2015-10-142-57/+84
| | | | | | | | | | | | When provided, default paths are ignored. Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add devices param to the hostconfig documentationJoffrey F2015-10-141-0/+8
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Update changelog and bump version to 1.5.0Joffrey F2015-10-142-1/+38
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Use url-safe base64 when encoding auth headerJoffrey F2015-10-142-4/+15
| | | | | | | | | | | | + regression test Signed-off-by: Joffrey F <joffrey@docker.com>
| * put/get archive implementationJoffrey F2015-10-148-2/+198
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Docs: Remove float from valid cpu_shares typesJoffrey F2015-10-141-1/+1
| | | | | | | | | | | | Fixes #775 Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix testsJoffrey F2015-10-142-9/+13
| | | | | | | | | | | | Skips were masking some errors / compatibility issues Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add minimum_version decorators on NetworkApi methodsJoffrey F2015-10-141-1/+7
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Implement methods for managing networksAanand Prasad2015-10-145-1/+290
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Don't break when volume binds contain unicode charactersJoffrey F2015-10-142-6/+104
| | | | | | | | | | | | Also includes a few unit tests for utils.convert_volume_binds Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #802 from docker/785-docker_config_envJoffrey F2015-10-132-57/+84
|\ \ | | | | | | Use DOCKER_CONFIG environment variable to look up auth config
| * | Use DOCKER_CONFIG environment variable to look up auth config785-docker_config_envJoffrey F2015-10-092-57/+84
| | | | | | | | | | | | | | | | | | When provided, default paths are ignored. Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #801 from docker/1.5.0-release1.5.0Joffrey F2015-10-123-1/+46
|\ \ \ | | | | | | | | 1.5.0 release
| * | | Add devices param to the hostconfig documentation1.5.0-releaseJoffrey F2015-10-081-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | Update changelog and bump version to 1.5.0Joffrey F2015-10-082-1/+38
| |/ / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #806 from docker/803-urlsafe-b64Joffrey F2015-10-092-4/+15
|\ \ \ | |/ / |/| | Use url-safe base64 when encoding auth header
| * | Use url-safe base64 when encoding auth header803-urlsafe-b64Joffrey F2015-10-092-4/+15
|/ / | | | | | | | | | | + regression test Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'archive_endpoint'Joffrey F2015-10-088-2/+198
|\ \
| * | put/get archive implementationJoffrey F2015-10-088-2/+198
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Docs: Remove float from valid cpu_shares typesJoffrey F2015-10-081-1/+1
|/ / | | | | | | | | | | Fixes #775 Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix testsJoffrey F2015-10-082-9/+13
| | | | | | | | | | | | Skips were masking some errors / compatibility issues Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'aanand-networking'Joffrey F2015-10-085-1/+296
|\ \
| * | Add minimum_version decorators on NetworkApi methodsJoffrey F2015-10-081-1/+7
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Merge branch 'networking' of https://github.com/aanand/docker-py into ↵Joffrey F2015-10-085-1/+290
| |\ \ |/ / / | | | | | | aanand-networking
| * | Implement methods for managing networksAanand Prasad2015-10-055-1/+290
| |/ | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #787 from docker/782-unicode-volume-pathsJoffrey F2015-10-052-6/+104
|\ \ | |/ |/| Don't break when volume binds contain unicode characters
| * Don't break when volume binds contain unicode characters782-unicode-volume-pathsJoffrey F2015-09-252-6/+104
| | | | | | | | | | | | Also includes a few unit tests for utils.convert_volume_binds Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #797 from paulbellamy/test-race-conditionmnowster2015-10-011-1/+1
|\ \ | | | | | | Fix race condition in integration regression tests
View Lorry Controller Status