summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix stop timeout bugfix_649Joffrey F2015-06-242-1/+6
|
* Merge pull request #645 from docker/update-websocket-client-depAanand Prasad2015-06-195-30/+5
|\ | | | | Update websocket client dependency
| * Simplified tox configupdate-websocket-client-depJoffrey F2015-06-191-19/+1
| |
| * Updated websocket-client dependency to latest version (now supports python 3)Joffrey F2015-06-194-11/+4
|/
* Merge branch 'cesanta-master'Joffrey F2015-06-191-3/+8
|\
| * Support 401 status for v2 registry endpointJoffrey F2015-06-191-3/+6
| |
| * Merge branch 'master' of https://github.com/cesanta/docker-py into ↵Joffrey F2015-06-191-1/+3
| |\ |/ / | | | | cesanta-master
| * Fix pinging an unauthenticated v2 registryMarko Mikulicic2015-05-291-1/+3
| |
* | Added Aanand (@aanand) as a maintainerJoffrey F2015-06-191-2/+2
| |
* | Merge branch 'glogiotatidis-pullfix'Joffrey F2015-06-191-1/+4
|\ \
| * \ Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into ↵Joffrey F2015-06-191-1/+4
| |\ \ |/ / / | | | | | | | | | | | | | | | glogiotatidis-pullfix Conflicts: docker/client.py
| * | Fix pull parameter for docker server version < 1.7.Giorgos Logiotatidis2015-06-011-0/+6
| | |
| * | Set default value for pull to False on build(). Fixes 622.Giorgos Logiotatidis2015-06-011-1/+1
| |/
* | Merge pull request #614 from ibuildthecloud/extra-host-listJoffrey F2015-06-181-1/+1
|\ \ | | | | | | Allow extra_hosts to be a list too
| * | Allow extra_hosts to be a list tooDarren Shepherd2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The current map syntax does not allow the API equivalent of --add-host foo:1.1.1.1 --add-host foo:2.2.2.2 The above will map one hostname to two IPs. The above is valid in Docker.
* | | Merge pull request #609 from mattmoor/masterJoffrey F2015-06-181-1/+1
|\ \ \ | | | | | | | | Update docker-py to use a more portable sense of HOME.
| * | | Update docker-py to use a more portable sense of HOME.Matt Moore2015-05-211-1/+1
| |/ / | | | | | | | | | | | | This makes docker-py consistent with Docker's newish way of establishing the path to .dockercfg: https://github.com/docker/docker/blob/master/pkg/homedir/homedir.go
* | | Merge branch 'ssanderson-use-wraps'Joffrey F2015-06-181-0/+4
|\ \ \
| * | | Fixed import styleJoffrey F2015-06-181-2/+3
| | | |
| * | | Merge branch 'use-wraps' of https://github.com/ssanderson/docker-py into ↵Joffrey F2015-06-181-0/+3
| |\ \ \ |/ / / / | | | | | | | | ssanderson-use-wraps
| * | | Use functools.wraps for check_resource decorator.Scott Sanderson2015-06-021-0/+3
| | |/ | |/| | | | | | | | | | | | | This helps runtime introspection tools like the `help()` builting or IPython's `?` operator correctly find the underlying method instead of the decorator definition.
* | | Merge branch 'aanand-allow-any-mode'Joffrey F2015-06-183-3/+63
|\ \ \
| * \ \ Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into ↵Joffrey F2015-06-183-3/+63
| |\ \ \ |/ / / / | | | | | | | | aanand-allow-any-mode
| * | | Allow any mode string to be passed into a volume bindAanand Prasad2015-06-053-3/+63
| |/ / | | | | | | | | | | | | | | | | | | | | | Volume binds now take a "mode" key, whose value can be any string. "ro" is still supported. It is an error to specify both "ro" and "mode". Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #633 from edmorley/update-b2d-shellinit-exampleJoffrey F2015-06-181-4/+1
|\ \ \ | | | | | | | | Docs: Update boot2docker shellinit example to use 'eval'
| * | | Docs: Update boot2docker shellinit example to use 'eval'Ed Morley2015-06-101-4/+1
| |/ / | | | | | | | | | | | | | | | | | | The boot2docker documentation has since changed the recommended way to use shellinit - see boot2docker/boot2docker#786. The command also no longer prints the export lines to the console, so have updated the example output.
* | | Bumped default API version == 1.19Joffrey F2015-06-182-2/+2
| | |
* | | Only allow volume_driver param if API version >= 1.19Joffrey F2015-06-181-3/+8
| | |
* | | Enforce consistent style for push and pull methodsJoffrey F2015-06-181-10/+13
| | |
* | | small doc fixesJoffrey F2015-06-181-3/+3
| | |
* | | Bumped version to 1.3.0 (dev)Joffrey F2015-06-181-1/+1
| | |
* | | Add and document a decode parameter for buildPhilipp Möller2015-06-182-2/+5
| | | | | | | | | | | | | | | This makes the build method consistent with the events method and adds some convenience.
* | | Add raise_for_status check to push and pull methodsBradley Cicenas2015-06-181-0/+4
| | | | | | | | | | | | as underlying exceptions(such as push already in progress) will be hidden in the stream generator otherwise.
* | | Add volume_driver param to client.create_containerLuke Marsden2015-06-184-3/+37
| | | | | | | | | | | | | | | | | | | | | - Add appropriate test which also asserts that volume names can be passed through to drivers. - Add new param to docs. Signed-off-by: Luke Marsden <luke@clusterhq.com>
* | | Updated mkdocs to use the new pages index formatJoffrey F2015-06-181-10/+10
| | |
* | | Updated site_url value in mkdocs file1.2.3Joffrey F2015-06-181-1/+1
| | |
* | | Fixed integration testJoffrey F2015-06-181-1/+1
| | |
* | | Release 1.2.3Joffrey F2015-06-182-1/+2
| | |
* | | Merge branch '1.3.0-rc0'Joffrey F2015-06-185-2/+81
|\ \ \ | |/ / |/| |
| * | Updated ChangeLog for 1.2.31.3.0-rc0Joffrey F2015-06-161-1/+28
| | |
| * | Bump RC1.2.3-rc1Joffrey F2015-06-121-1/+1
| | |
| * | Merge branch 'aanand-allow-binds-list' into 1.3.0-rc0Joffrey F2015-06-124-2/+57
| |\ \
| | * | Allow binds to be specified as a list of stringsAanand Prasad2015-06-123-0/+46
| |/ / |/| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #612 from ibuildthecloud/fix-readonlyMaxime Petazzoni2015-05-261-1/+1
|\ \ \ | |_|/ |/| | Typo in ReadonlyRootfs
| * | Typo in ReadonlyRootfsDarren Shepherd2015-05-251-1/+1
|/ / | | | | | | read_only parameter does not work because the wrong name is sent to Docker
* | Merge pull request #562 from smothiki/memsJoffrey F2015-05-202-1/+10
|\ \ | | | | | | make memory units compatible with native docker cli
| * | make memory units compatible with native docker clismothiki2015-05-072-1/+10
| | | | | | | | | | | | Signed-off-by: sivaram mothiki <smothiki@engineyard.com>
| | * Changelog WIP1.2.3-rc0Joffrey F2015-05-261-0/+6
| | |
| | * Bumped version (rc)Joffrey F2015-05-261-2/+2
| |/ |/|
* | Merge branch 'tonicbupt-privilege'Joffrey F2015-05-201-2/+7
|\ \