summaryrefslogtreecommitdiff
path: root/docker/utils
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add journald log driver supportErik Cederberg2015-08-031-1/+2
| |/ / | | | | | | | | | Signed-off-by: Erik Cederberg <erikced@gmail.com>
* | | unpack key-value pairJoffrey F2015-08-041-2/+1
| | |
* | | Squashed commit of the following:Viktor Petersson2015-07-302-1/+28
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4f053a06c1e9e3f63fd5afde60322f676acbdf45 Merge: 9177380 07a99ea Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 14:37:16 2015 +0100 Merge branch 'master' into fixes commit 9177380ae9abf4ca01cf7a2a8b7de6640ed5f5d5 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 14:00:51 2015 +0100 Tweaks exception message. commit 6a5832e2f6655835a6b87897d7ec82d6ef5faa50 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 13:17:32 2015 +0100 Simplifies logic as per feedback. commit f750eddc34e5356dcfb53c16a7f98a99e817fa53 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 11:09:14 2015 +0100 Move return from list to dict. Adds exception handling. commit 8e50f57cceb6370b7f7b41624f50d5a6835301a0 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 10:15:58 2015 +0100 Reverts change to .gitignore. commit 5ba2c1b29706ddb74bef9c24c2a6e64bb369db22 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 21:15:21 2015 +0100 Fixes feedback. Adds three unittests. commit e1c719e61993fdaec0f22ba0de706af80587dc16 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 17:00:16 2015 +0100 WIP Adds test for parse_env_file commit 4448ae72e55d889d9d194a2c0303d182cb157d4c Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 16:42:49 2015 +0100 Excludes coverage files. commit 19a5d01615dd9b7ee939f54f256e5bae89a94ee1 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 16:42:42 2015 +0100 Switch fixes logic. commit a8094c63a9f4351ae71393ea5603aa11c5c5bc94 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:45:56 2015 +0100 Implements logic for envfile parsing from Docker-cli Ref: https://github.com/docker/docker/blob/master/opts/envfile.go#L19-L51 commit ea9bfd95dfafe4023c58ab37f990158f73eb2e0d Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:41:23 2015 +0100 Replaces CSV module with manual splitting. commit a001d28ff48309d2b2338aaf27253fdfaa0f6c4b Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:35:37 2015 +0100 Removes isinstance on filename. commit 419d5961f6103df9166be3a9baa549276c12223d Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 22:39:33 2015 +0100 Reflects @aanand's feedback. commit e81e3c8ed797ff939843d2485bf15525e85e890d Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 15:43:32 2015 +0100 Typo fix. commit 2898389cada2bfca64bdfa71359aebeb3b5b6d1b Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 15:41:08 2015 +0100 Refs #565. Adds minimal implementation of env_file client-side support.
* | Merge pull request #680 from aanand/fix-timestamp-conversionJoffrey F2015-07-211-3/+3
|\ \ | |/ |/| Enforce UTC datetimes in arguments to `events()`
| * Enforce UTC datetimes in arguments to `events()`Aanand Prasad2015-07-211-3/+3
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Stop pinging registries from the clientAanand Prasad2015-07-201-0/+6
|/ | | | | | | | | | | | | | | | | The daemon already pings the registry, so doing it on our end is redundant and error-prone. The `insecure_registry` argument to `push()`, `pull()` and `login()` has been deprecated - in the latter case, it wasn't being used anyway. The `insecure` argument to `docker.auth.resolve_repository_name()` has also been deprecated. `docker.utils.ping_registry()` has been deprecated. `docker.auth.expand_registry_url()` has been removed. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #644 from docker/memory-memswap-hostconfigJoffrey F2015-06-301-7/+32
|\ | | | | memory / memswap in hostconfig
| * Moved mem_limit and memswap_limit to host_config for API version >= 1.19Joffrey F2015-06-191-7/+32
| |
* | 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-301-0/+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-201-0/+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 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.
* | | | 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>
* | | | Only allow volume_driver param if API version >= 1.19Joffrey F2015-06-181-3/+8
| | | |
* | | | Add volume_driver param to client.create_containerLuke Marsden2015-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | 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>
* | Fixed check_resource decoratorJoffrey F2015-05-201-5/+3
| |
* | Fix #602. Raise ValueError on empty argument to inspect_{container,image}() ↵Matt Bogosian2015-05-171-0/+2
| | | | | | | | methods.
* | Set 'CpusetCpus' with the value of the cpuset param in create_containerJoffrey F2015-05-081-0/+1
|/
* Fix #573Joffrey F2015-04-281-6/+9
|
* Change decorators to use a relative import.dlorenc2015-04-271-2/+2
| | | | | | | | This is more consistent with the way the rest of the package imports errors. This also solves a crazy cyclical import issue I'm seeing. Signed-off-by: dlorenc <lorenc.d@gmail.com>
* Use custom Error class (inherits DockerException and ValueError)check_resource_not_noneJoffrey F2015-04-271-1/+4
|
* Added check_resource decorator to interrupt command if container or image ↵Joffrey F2015-04-242-1/+12
| | | | argument is None
* Merge pull request #563 from docker/logconfig-supportJoffrey F2015-04-243-4/+66
|\ | | | | Logconfig support
| * Added log_config support in host configJoffrey F2015-04-243-4/+66
| |
* | v2 doesn't have a /_ping endpoint, use /v2/ instead. Fixes #549Joffrey F2015-04-241-1/+1
|/
* improved Ulimit classJoffrey F2015-04-221-7/+22
|
* Add support for ulimits in host_configJoffrey F2015-04-223-1/+49
|
* Modify expand_registry_url to support v2 private registries.support_v2_private_registryJoffrey F2015-04-222-2/+6
|
* Merge pull request #537 from onorua/masterJoffrey F2015-04-221-1/+5
|\ | | | | IPC sharing implementation
| * IPC sharing implementationYaroslav Molochko2015-03-301-1/+5
| |
* | removed unneeded importsYuval Kohavi2015-04-171-2/+0
| | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* | Adding port utils to split port rangesYuval Kohavi2015-04-032-0/+90
|/ | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* Added some type and version checks; removed security_opt from ↵Joffrey F2015-03-251-2/+6
| | | | container_config (as this is invalid)
* Add security_opt for create/startEric Windisch2015-03-241-3/+7
| | | | Signed-off-by: Eric Windisch <eric@windisch.us>
* Finish labels implementation, add tests and docsAanand Prasad2015-03-201-6/+5
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Implemented labels for docker-pyAndré Martins2015-03-171-2/+13
| | | | Signed-off-by: André Martins <martins@noironetworks.com>
* Merge pull request #488 from docker/memoryswapJoffrey F2015-02-112-1/+142
|\ | | | | Container config cleanup
View Lorry Controller Status