summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* ClientBase class to extract utility methods and constructor and sanitize ↵clientbase_extractionJoffrey F2015-07-012-227/+240
| | | | Client class
* Merge pull request #651 from docker/fix_647Joffrey F2015-06-301-3/+12
|\ | | | | Fix adapter bug + regression test
| * Fix Unix socket adapter bug with double slash in path + regression testfix_647Joffrey F2015-06-301-3/+12
| |
* | Merge pull request #644 from docker/memory-memswap-hostconfigJoffrey F2015-06-302-10/+35
|\ \ | |/ |/| memory / memswap in hostconfig
| * Moved mem_limit and memswap_limit to host_config for API version >= 1.19Joffrey F2015-06-192-10/+35
| |
* | Merge pull request #661 from docker/fix_640Maxime Petazzoni2015-06-301-1/+1
|\ \ | | | | | | Added git@ as a valid prefix for remote build paths
| * | Added git@ as a valid prefix for remote build pathsfix_640Joffrey F2015-06-301-1/+1
| | |
* | | Merge pull request #654 from Melraidin/masterJoffrey F2015-06-291-12/+44
|\ \ \ | |/ / |/| | Prefer new Docker config location and format.
| * | Prefer new Docker config location and format.Kevin Martin2015-06-281-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | This tries to load Docker authentication info from ~/.docker/config.json before falling back to its legacy location and format at ~/.dockercfg. Resolves https://github.com/docker/docker-py/issues/648
* | | Fix small decorator issueJoffrey F2015-06-301-2/+2
| | |
* | | CleanupJoffrey F2015-06-301-3/+2
| | |
* | | Merge branch 'id-resolution-in-check-resource' of ↵Joffrey F2015-06-302-51/+2
|\ \ \ | |/ / |/| | | | | https://github.com/posita/docker-py into posita-id-resolution-in-check-resource
| * | Move image/container ID resolution to @check_resource decorator.Matt Bogosian2015-05-202-51/+2
| | |
* | | Fix stop timeout bugfix_649Joffrey F2015-06-241-1/+1
| | |
* | | Updated websocket-client dependency to latest version (now supports python 3)Joffrey F2015-06-191-7/+2
| | |
* | | 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
| | |
* | | 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
* | | | 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 'allow-any-mode' of https://github.com/aanand/docker-py into ↵Joffrey F2015-06-181-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | aanand-allow-any-mode
| * | | | Allow any mode string to be passed into a volume bindAanand Prasad2015-06-051-1/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Bumped default API version == 1.19Joffrey F2015-06-181-1/+1
| | | |
* | | | 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
| | | |
* | | | Bumped version to 1.3.0 (dev)Joffrey F2015-06-181-1/+1
| | | |
* | | | Add and document a decode parameter for buildPhilipp Möller2015-06-181-2/+3
| | | | | | | | | | | | | | | | | | | | 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-182-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | Release 1.2.3Joffrey F2015-06-181-1/+1
| | | |
* | | | Bump RC1.2.3-rc1Joffrey F2015-06-121-1/+1
| | | |
* | | | Merge branch 'aanand-allow-binds-list' into 1.3.0-rc0Joffrey F2015-06-121-1/+7
|\ \ \ \
| * | | | Allow binds to be specified as a list of stringsAanand Prasad2015-06-121-0/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | | 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-201-0/+3
| |\ \ | | |/ | |/| make memory units compatible with native docker cli
| | * make memory units compatible with native docker clismothiki2015-05-071-0/+3
| | | | | | | | | | | | Signed-off-by: sivaram mothiki <smothiki@engineyard.com>
* | | Bumped version (rc)Joffrey F2015-05-261-2/+2
|/ /
* | Only allow privileged exec_create for API version >= 1.19Joffrey F2015-05-201-2/+6
| |
* | Merge branch 'privilege' of https://github.com/tonicbupt/docker-py into ↵Joffrey F2015-05-201-2/+3
|\ \ | | | | | | | | | tonicbupt-privilege
| * | add privilege for exec_createtonic2015-05-081-2/+3
| | |
* | | Fixed check_resource decoratorJoffrey F2015-05-201-5/+3
| | |
* | | Fix #602. Raise ValueError on empty argument to inspect_{container,image}() ↵Matt Bogosian2015-05-172-0/+4
| | | | | | | | | | | | methods.