summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add test for streaming statsAntonis Kalipetis2015-10-221-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also, fix typo in non-streaming stats. Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
| * | | Add integration test for stats no-streamAntonis Kalipetis2015-10-221-0/+17
| | | | | | | | | | | | | | | | Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
| * | | Enhance docs for stats methodAntonis Kalipetis2015-10-221-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
| * | | Add suport for non-stream stats of containersAntonis Kalipetis2015-10-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds one more flag to the `stats` method for streaming responses. Keeps default as streamed response for backwards compatibility. Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
* | | | Merge pull request #834 from lots0logs/814-host-config-mem-swapDaniel Nephin2015-11-163-19/+68
|\ \ \ \ | | | | | | | | | | Add support for MemorySwappiness to client.create_host_config()
| * | | | Update hostconfig.mdDustin Falgout2015-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
| * | | | Dont include mem_swappiness when testing use of str valuesDustin Falgout2015-11-051-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
| * | | | Incorporates feedback from and closes #814Dustin Falgout2015-11-053-19/+69
| | |/ / | |/| | | | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | | | Merge pull request #851 from docker/remove-ci-transition-filesJoffrey F2015-11-122-17/+0
|\ \ \ \ | | | | | | | | | | Remove unused files
| * | | | Remove unused filesremove-ci-transition-filesJoffrey F2015-11-122-17/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Merge pull request #850 from docker/mnowster-test-no-log-driver-specifiedJoffrey F2015-11-121-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | Rebased #798
| * | | | Merge branch 'test-no-log-driver-specified' of ↵mnowster-test-no-log-driver-specifiedJoffrey F2015-11-121-2/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mnowster/docker-py into mnowster-test-no-log-driver-specified Signed-off-by: Joffrey F <joffrey@docker.com>
| | * | | | Remove skip testMazz Mosley2015-10-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been reported that the bug in docker has now been fixed so we can re-instate this test. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
* | | | | | Merge pull request #796 from v-boyko/feature/logs_sinceDaniel Nephin2015-11-124-2/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support the 'since' option in the 'containers/<id>/logs' endpoint (API upgrade)
| * \ \ \ \ \ Merge upstream branch 'master' into feature/logs_sinceViacheslav Boiko2015-11-0549-3365/+4239
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
| * | | | | | Support the 'since' option in the 'containers/<id>/logs' endpointViacheslav Boiko2015-10-024-2/+49
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
* | | | | | Merge pull request #848 from docker/845-fixJoffrey F2015-11-122-19/+32
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Client.logs(tail=0) now shows no past logs (expected behavior)
| * | | | | Client.logs(tail=0) now shows no past logs (expected behavior)Joffrey F2015-11-122-19/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test confirming the new behavior. Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Add build integration test checking stderr shows up in streamJoffrey F2015-11-112-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | | Merge pull request #846 from docker/838-updateJoffrey F2015-11-112-1/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | Support for build arguments
| * | | | Update buildargs test to avoid race condition838-updateJoffrey F2015-11-101-2/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | | Support 'buildargs' parameter for docker 1.9.Leonty2015-11-102-1/+25
|/ / / / | | | | | | | | | | | | Signed-off-by: Leonty Balovnev <tigreavecdesailes@gmail.com>
* | | | Merge pull request #839 from docker/bump_api_version_121Aanand Prasad2015-11-053-17/+20
|\ \ \ \ | |_|/ / |/| | | Bump default API version to 1.21
| * | | 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>