Commit Graph

1407 Commits

Author SHA1 Message Date
Dustin Falgout 64fc383f2c Update hostconfig.md
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-11-09 02:41:15 -06:00
Stephen Moore da3377771c Ensure assert_hostname is set on the pool connection
If you have assert_hostname turned off and are using a proxy on your
computer then assert_hostname wasn't being properly set on the pool
connection and it was failing to connect to docker

Signed-off-by: Stephen Moore <stephen@delfick.com>
2015-11-08 12:18:19 +11:00
Aanand Prasad 881e24c231 Merge pull request #839 from docker/bump_api_version_121
Bump default API version to 1.21
2015-11-05 15:09:06 +00:00
Viacheslav Boiko 3330569772
Merge upstream branch 'master' into feature/logs_since
Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
2015-11-05 11:56:06 +01:00
Dustin Falgout 01353c11ca Dont include mem_swappiness when testing use of str values
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-11-05 02:52:18 -06:00
Dustin Falgout c07dd53a2a Incorporates feedback from and closes #814
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-11-05 02:20:53 -06:00
Joffrey F 4f1304c108 Bump default API version to 1.21
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>
2015-11-04 19:32:22 +01:00
Alejandro Brito Monedero a695f0ca5a Fix #627
Docker-py couldn't pull private images if the account have non ascii chars
in either user or password. It that case an exception ending with no auth
credentials.
Instead docker client (golang) don't suffer this issue.

Also add a test to check the login or password even with non ascii char have
a valid auth dictionary

Signed-off-by: Alejandro Brito Monedero <abrito@alea-soluciones.com>
2015-10-29 16:12:30 +01:00
Joffrey F 47ab89ec2b Merge pull request #830 from docker/fix-links-create-test
Use network_mode=bridge when testing links
2015-10-28 16:36:34 +01:00
Joffrey F aaeb6c1087 Use network_mode=bridge when testing links
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>
2015-10-28 14:52:17 +01:00
Joffrey F f4c881f37d Merge pull request #827 from coreypobrien/lessbinding
Move container volume bind tests to their own class
2015-10-28 11:07:35 +01:00
Corey O'Brien a2184def6e Move container volume bind tests to their own class
Signed-off-by: Corey O'Brien <coreypobrien@gmail.com>
2015-10-27 16:08:58 -05:00
Joffrey F a610a1be0e Fix py3.2 test failure and unicode behavior
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-27 18:01:19 +01:00
Joffrey F 311ae711d4 Merge pull request #825 from aebm/master
Fix auth.load_config bug calling parse_auth
2015-10-27 15:57:00 +01:00
Joffrey F 929e046567 Merge pull request #824 from dnephin/fix_unicode_commands
Support unicode commands
2015-10-27 10:07:35 +01:00
Alejandro Brito Monedero 22da6ace7a Fix auth.load_config bug calling parse_auth
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>
2015-10-27 09:03:28 +01:00
Daniel Nephin 417c80057b Support unicode commands.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-10-26 17:22:14 -04:00
Antonis Kalipetis 7e2ec1ac6b Add EditorConfig to the repo.
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2015-10-22 14:06:45 +00:00
Antonis Kalipetis 5cfd2da448 Add test for streaming stats
Also, fix typo in non-streaming stats.

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2015-10-22 14:05:55 +00:00
Antonis Kalipetis 192391a5a8 Add integration test for stats no-stream
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2015-10-22 10:28:04 +00:00
Antonis Kalipetis 019a365a02 Enhance docs for stats method
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2015-10-22 10:23:53 +00:00
Antonis Kalipetis a11c11430a Add suport for non-stream stats of containers
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>
2015-10-22 10:23:53 +00:00
Joffrey F 0234ddebf3 Merge pull request #809 from docker/reorganize_tests
Reorganize tests
2015-10-21 16:44:45 -07:00
Joffrey F 93a296fb04 Reorganize test directories
More clearly separate unit and integration tests
Allow splitting into multiple files
Cleaner

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-21 16:02:09 -07:00
Joffrey F 5a1c7ed8bf Merge pull request #820 from docker/819-volumes-create
Update `Client.create_volume` to use new endpoint
2015-10-21 14:21:01 -07:00
Joffrey F 0258c6e622 Update `Client.create_volume` to use new endpoint
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>
2015-10-21 13:51:09 -07:00
Joffrey F 4552e78c02 Merge pull request #812 from docker/811-unix-adapter
Fix Unix adapter bug with newer versions of requests
2015-10-21 11:00:00 -07:00
Joffrey F 326049c8bb Fix Unix adapter bug with newer versions of requests
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>
2015-10-19 16:55:49 -07:00
Joffrey F fad509b3bd Back to dev version
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-19 16:55:24 -07:00
Daniel Nephin c698674602 Merge pull request #808 from alasdairnicol/docs_examples
Docs examples
2015-10-15 10:40:06 -04:00
Joffrey F 51d2125c59 Pull correct version of busybox in integration tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:37:45 -07:00
Joffrey F 80baee55b6 Merge branch 'delfick-patch-1' 2015-10-14 17:34:11 -07:00
Stephen Moore 7f3692ceed Fix attach method over SSL connections
Signed-off-by: Stephen Moore <stephen@delfick.com>
2015-10-14 17:29:31 -07:00
Joffrey F b1f25317de Use DOCKER_CONFIG environment variable to look up auth config
When provided, default paths are ignored.

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 0932ac230b Add devices param to the hostconfig documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 9697923bca Update changelog and bump version to 1.5.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F a3a345e2f6 Use url-safe base64 when encoding auth header
+ regression test

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 147df4d21f put/get archive implementation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 6a66a2248d Docs: Remove float from valid cpu_shares types
Fixes #775

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 55a0783f4b Fix tests
Skips were masking some errors / compatibility issues

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F d141976303 Add minimum_version decorators on NetworkApi methods
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Aanand Prasad 53589e5f0a Implement methods for managing networks
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-14 17:26:50 -07:00
Joffrey F a1393ee8ac Don't break when volume binds contain unicode characters
Also includes a few unit tests for utils.convert_volume_binds

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Alasdair Nicol 0c2aaac3d5 Tidied up code examples in docs
* Use `cli = Client` everywhere
 * Use Client.create_host_config method
 * Added missing '>'s

Signed-off-by: Alasdair Nicol <alasdair@thenicols.net>
2015-10-14 22:53:21 +01:00
Joffrey F baaa3e3b1a Merge pull request #802 from docker/785-docker_config_env
Use DOCKER_CONFIG environment variable to look up auth config
2015-10-13 18:18:36 -07:00
Joffrey F 36f3480ccc Merge pull request #801 from docker/1.5.0-release
1.5.0 release
2015-10-12 13:49:48 -07:00
Joffrey F 23cf76838a Use DOCKER_CONFIG environment variable to look up auth config
When provided, default paths are ignored.

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-09 17:15:19 -07:00
Joffrey F 16247df3c2 Merge pull request #806 from docker/803-urlsafe-b64
Use url-safe base64 when encoding auth header
2015-10-09 14:13:21 -07:00
Joffrey F 3c4e5db113 Use url-safe base64 when encoding auth header
+ regression test

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-09 12:23:58 -07:00
Joffrey F 5d95f24264 Add devices param to the hostconfig documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-08 17:28:43 -07:00