summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated documentation with HostConfig informationhost_configJoffrey F2014-12-173-6/+103
|
* Re-added integration tests with hostconfig in startJoffrey F2014-12-171-3/+162
|
* Re-added start with hostconfig testsJoffrey F2014-12-171-1/+241
|
* Un-deprecated hostconfig in startJoffrey F2014-12-171-33/+6
|
* Fixed start_container testsJoffrey F2014-12-171-16/+6
|
* assertEquals -> assertEqualJoffrey F2014-12-171-5/+5
|
* Updated integration tests to use new host_config paramJoffrey F2014-12-171-37/+52
|
* Fixed VolumesFrom bugJoffrey F2014-12-171-1/+1
|
* Prevent start_config from overriding host_config in create if no param is ↵Joffrey F2014-12-171-5/+11
| | | | specified
* Updated unit testsJoffrey F2014-12-171-204/+221
| | | | | * Warnings will now raise exceptions in unit tests * Updated several tests to use host_config
* Updated mock API versionJoffrey F2014-12-171-1/+1
|
* Added create_host_config helper in docker.utilsJoffrey F2014-12-172-1/+68
|
* * create_container now supports a host_config paramJoffrey F2014-12-171-14/+52
| | | | * Deprecation warnings added in Client.start
* Merge pull request #429 from dims/masterJoffrey F2014-12-172-5/+5
|\ | | | | Devices should be separated by colon separated string
| * Devices should be separated by colon separated stringDavanum Srinivas2014-12-172-5/+5
| | | | | | | | | | | | 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.
* | Merge pull request #430 from bfirsh/travis-dockerJoffrey F2014-12-171-3/+1
|\ \ | | | | | | Run Travis tests on Docker
| * | Run Travis tests on DockerBen Firshman2014-12-171-3/+1
|/ / | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge branch 'jseybold-master'Joffrey F2014-12-152-2/+3
|\ \
| * | timeout param in wait documentedJoffrey F2014-12-151-0/+1
| | |
| * | Added timeout param to Client.waitJoffrey F2014-12-151-2/+2
|/ /
* | Merge pull request #271 from robertglen/byteIO-seekfixJoffrey F2014-12-151-0/+2
|\ \ | | | | | | Fixed bug in utils.mkbuildcontext for BytesIO Dockerfiles
| * | Should be done for StringIO objects as wellRobert Glen2014-07-101-0/+1
| | |
| * | Fixed bug in utils.mkbuildcontext for BytesIO DockerfilesRobert Glen2014-07-091-0/+1
| | | | | | | | | | | | | | | | | | - resetting dockerfile seek position to 0 after dockerfile.getvalue() is called - prevents traceback on line utils.py line 43 - 'IOError("end of file reached")' in tarfile.py
* | | Added forcerm param in Client.buildJoffrey F2014-12-152-1/+4
| | |
* | | Merge pull request #423 from docker/0.6.0-integrationJoffrey F2014-12-151-20/+15
|\ \ \ | | | | | | | | Fixed integration tests
| * | | Don't use old test image (deprecated ID scheme)0.6.0-integrationJoffrey F2014-12-151-14/+8
| | | |
| * | | Better pull confirmationJoffrey F2014-12-151-8/+6
| | | |
| * | | Longer timeout when contacting hubJoffrey F2014-12-151-0/+3
| | | |
* | | | Merge pull request #421 from hammerdr/docker-build-pullJoffrey F2014-12-153-2/+18
|\ \ \ \ | |_|_|/ |/| | | Allow for pull as an option to docker build
| * | | Fix the order of pullDerek Hammer2014-12-152-4/+4
| | | |
| * | | Allow for pull as an option to docker buildDerek Hammer2014-12-133-1/+17
|/ / / | | | | | | | | | Signed-off-by: Derek Hammer <derek.r.hammer@gmail.com>
* | | Merge pull request #318 from Precis/verified_loginJoffrey F2014-11-261-2/+3
|\ \ \ | | | | | | | | Expand registry URL before login.
| * | | Expand registry URL before login.Matthias Erll2014-09-101-2/+3
| | | |
* | | | Merge pull request #411 from docker/393-enforce-str-versionJoffrey F2014-11-262-0/+17
|\ \ \ \ | | | | | | | | | | Enforce passing string as version param in ctor
| * | | | Enforce passing string as version param in ctor393-enforce-str-versionJoffrey F2014-11-262-0/+17
| | | | |
* | | | | Merge branch 'maxcnunes-fix-env-variables-unicode'Joffrey F2014-11-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Changed unicode literal to explicit typecast (3.2 compat)Joffrey F2014-11-261-1/+1
| | | | |
| * | | | Merge branch 'fix-env-variables-unicode' of github.com:maxcnunes/docker-py ↵Joffrey F2014-11-261-1/+1
| |\ \ \ \ |/ / / / / | | | | | | | | | | into maxcnunes-fix-env-variables-unicode
| * | | | fixes problem when using environment variables that depends on utf-8 encodingMax Claus Nunes2014-11-231-1/+1
| | | | |
* | | | | Merge pull request #409 from mattmoor/masterJoffrey F2014-11-261-4/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix expand_registry_url to be consistent with docker client.
| * | | | | Fix expand_registry_rul to be consistent with docker client.Matt Moore2014-11-251-4/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #400 from adeslade/create-container-with-extra-hostsJoffrey F2014-11-241-1/+12
|\ \ \ \ \ | |/ / / / |/| | | | Allow ExtraHosts to be specified when creating a container
| * | | | Fix pep8 errorsAdrian Slade2014-11-141-2/+2
| | | | |
| * | | | Allow ExtraHosts to be specified when creating a containerAdrian Slade2014-11-141-1/+12
| | | | |
* | | | | Merge pull request #388 from leth/patch-1Joffrey F2014-11-141-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Walk file tree in order for deterministic builds
| * | | | Walk file tree in order for deterministic buildsMarcus Cobden2014-11-041-1/+2
| | | | | | | | | | | | | | | Python's `os.walk` does not order the lists of files and directories it returns, so in order to produce a consistent build context tarfile, they should be ordered.
* | | | | Merge branch 'vladfr-365-document-boot2docker'Joffrey F2014-11-148-80/+103
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed trailing whitespace in docsJoffrey F2014-11-146-77/+76
| | | | |
| * | | | Moved boot2docker instructions to their own fileJoffrey F2014-11-143-23/+24
| | | | |
| * | | | add documentation for boot2docker #365Vlad Fratila2014-11-121-3/+26
|/ / / /