docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,158 Commits 23 Branches 129 Tags 9.1 MiB
Commit Graph

3158 Commits

Author SHA1 Message Date
Joffrey F 8aded4842b Retry on connection error 2014-12-17 12:55:49 -08:00
Joffrey F f75afc92a2 Use unicode() typecast instead of u'' literal (3.2 compat). Fixes #408 2014-12-17 12:07:35 -08:00
Joffrey F 16379f85c1 Merge branch 'leth-master' 2014-12-17 11:57:23 -08:00
Joffrey F b1e0ca0bd6 Merge branch 'master' of https://github.com/leth/docker-py into leth-master 
Conflicts:
	tests/test.py
 2014-12-17 11:56:58 -08:00
Joffrey F ec5a28a46e Merge pull request #428 from docker/host_config 
Support for host config
 2014-12-17 11:50:31 -08:00
Joffrey F 5711ac4cf3 Updated documentation with HostConfig information 2014-12-17 11:48:39 -08:00
Joffrey F 2b5516afab Re-added integration tests with hostconfig in start 2014-12-17 11:44:52 -08:00
Joffrey F 12aad176b9 Re-added start with hostconfig tests 2014-12-17 11:44:52 -08:00
Joffrey F f07524f2db Un-deprecated hostconfig in start 2014-12-17 11:44:52 -08:00
Joffrey F c29a6a2841 Fixed start_container tests 2014-12-17 11:44:52 -08:00
Joffrey F e992a8127d assertEquals -> assertEqual 2014-12-17 11:44:51 -08:00
Joffrey F 66112561f4 Updated integration tests to use new host_config param 2014-12-17 11:44:51 -08:00
Joffrey F e1401c5573 Fixed VolumesFrom bug 2014-12-17 11:44:51 -08:00
Joffrey F 09a5eb8ae7 Prevent start_config from overriding host_config in create if no param is specified 2014-12-17 11:44:51 -08:00
Joffrey F 19b1379f17 Updated unit tests 
* Warnings will now raise exceptions in unit tests
* Updated several tests to use host_config
 2014-12-17 11:44:51 -08:00
Joffrey F b214406b38 Updated mock API version 2014-12-17 11:44:31 -08:00
Joffrey F c9f9157ea8 Added create_host_config helper in docker.utils 2014-12-17 11:44:31 -08:00
Joffrey F 7bc6b228b1 * create_container now supports a host_config param 
* Deprecation warnings added in Client.start
 2014-12-17 11:44:31 -08:00
Joffrey F f2ba7f9b9d Merge pull request #429 from dims/master 
Devices should be separated by colon separated string
 2014-12-17 11:32:58 -08:00
Joffrey F ae4f883c91 Merge pull request #430 from bfirsh/travis-docker 
Run Travis tests on Docker
 2014-12-17 10:27:03 -08:00
Ben Firshman f32550c058 Run Travis tests on Docker 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-17 09:20:57 -08:00
Davanum Srinivas 3a51d3fe0b Devices should be separated by colon separated string 
Totally bad test :( (written by me). The documentation and
code should match now. Many thanks to pranavs18 for spotting
the error and proposing the fix.
 2014-12-17 07:35:07 -05:00
Marcus Cobden 578dda64c9 Consume from chunked streams without data loss 
Data already in local python buffers was lost when stream socket
fileobject was re-created. We now use http.client to handle the chunk
transfer encoding, and we read only the data from each chunk.

This adds a test harness for stream responses which tries to trigger the
lost-buffer behaviour by responding to the HTTP request in full, as
early as possible.

NB: Python's http.client will close the socket fileobj early if there is
no content length or chunked transfer encoding header. If this happens,
requests/urllib3 will reopen it, but we lose some data which was stored
in buffers.
 2014-12-16 20:36:08 +00:00
Joffrey F a87dfcf267 Merge branch 'jseybold-master' 2014-12-15 17:35:02 -08:00
Joffrey F ec04e92c02 timeout param in wait documented 2014-12-15 17:34:51 -08:00
Joffrey F 51c6b34859 Added timeout param to Client.wait 2014-12-15 17:32:42 -08:00
Joffrey F 7fcddc22ce Merge pull request #271 from robertglen/byteIO-seekfix 
Fixed bug in utils.mkbuildcontext for BytesIO Dockerfiles
 2014-12-15 16:26:52 -08:00
Joffrey F e8c9e6e3f2 Added forcerm param in Client.build 2014-12-15 15:23:25 -08:00
Joffrey F 73b15be0c1 Merge pull request #423 from docker/0.6.0-integration 
Fixed integration tests
 2014-12-15 15:01:20 -08:00
Joffrey F bf9e1c84ba Don't use old test image (deprecated ID scheme) 2014-12-15 14:52:51 -08:00
Joffrey F a4aa1a88f1 Better pull confirmation 2014-12-15 13:53:49 -08:00
Joffrey F 4b91a71313 Longer timeout when contacting hub 2014-12-15 12:11:54 -08:00
Joffrey F a7cce1d600 Merge pull request #421 from hammerdr/docker-build-pull 
Allow for pull as an option to docker build
 2014-12-15 11:26:00 -08:00
Derek Hammer 7426c52f0e Fix the order of pull 2014-12-15 10:49:37 -08:00
Derek Hammer d8e8400419 Allow for pull as an option to docker build 
Signed-off-by: Derek Hammer <derek.r.hammer@gmail.com>
 2014-12-13 10:31:47 -08:00
Joffrey F 4a7bb9a9b0 Merge pull request #318 from Precis/verified_login 
Expand registry URL before login.
 2014-11-26 14:37:42 -08:00
Joffrey F 2cdefc97d9 Merge pull request #411 from docker/393-enforce-str-version 
Enforce passing string as version param in ctor
 2014-11-26 14:28:47 -08:00
Joffrey F 2a90dd2ab5 Merge branch 'maxcnunes-fix-env-variables-unicode' 2014-11-26 23:28:18 +01:00
Joffrey F 30af5ea80c Changed unicode literal to explicit typecast (3.2 compat) 2014-11-26 23:28:00 +01:00
Joffrey F 613a38f0a0 Merge branch 'fix-env-variables-unicode' of github.com:maxcnunes/docker-py into maxcnunes-fix-env-variables-unicode 2014-11-26 23:25:32 +01:00
Joffrey F a9bc84cece Enforce passing string as version param in ctor 2014-11-26 23:14:19 +01:00
Joffrey F 0012430b1b Merge pull request #409 from mattmoor/master 
Fix expand_registry_url to be consistent with docker client.
 2014-11-26 12:03:54 -08:00
Matt Moore d8eb04084b Fix expand_registry_rul to be consistent with docker client. 
In docker-py's auth.py the functions 'resolve_repository_name' and 'expand_registry_url' work together to result a hostname prefix to a base URL suitable for interaction as a Docker registry.

For example, "docker push foo.com/bar/baz" would try to resolve the hostname "foo.com".

These functions loosely correlate to 'ResolveRepositoryName' and 'newEndpoint' in the docker client code, respectively.

You can see from their implementations:
 - ResolveRepositoryName: https://github.com/docker/docker/blob/master/registry/registry.go#L191
 - newEndpoint: https://github.com/docker/docker/blob/master/registry/endpoint.go#L71

that neither of them appends 'v1' to the hostname during resolution.

This change simply removes the 'v1' suffix from these code paths, which enables docker-py to authenticate against private registries with which the docker client can already.
 2014-11-25 21:06:54 -08:00
Joffrey F 56afc0598d Merge pull request #400 from adeslade/create-container-with-extra-hosts 
Allow ExtraHosts to be specified when creating a container
 2014-11-24 17:10:56 -08:00
Max Claus Nunes 1a9a285657 fixes problem when using environment variables that depends on utf-8 encoding 2014-11-23 20:58:35 -02:00
Adrian Slade 84fac67b17 Fix pep8 errors 2014-11-14 21:38:51 +00:00
Joffrey F fa617804e7 Merge pull request #388 from leth/patch-1 
Walk file tree in order for deterministic builds
 2014-11-14 10:11:41 -08:00
Adrian Slade 7750ddecaf Allow ExtraHosts to be specified when creating a container 2014-11-14 15:37:00 +00:00
Joffrey F 3c48d2d73d Merge branch 'vladfr-365-document-boot2docker' 2014-11-14 01:38:08 +01:00
Joffrey F bf077ace10 Removed trailing whitespace in docs 2014-11-14 01:37:46 +01:00