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

730 Commits

Author SHA1 Message Date
Aanand Prasad 113901c8e3 Prevent users from attempting to override 'version' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-25 14:34:42 +01:00
Aanand Prasad d9a149f327 Merge pull request #732 from docker/version-dependent-hostconfig 
Version dependent hostconfig
 2015-08-25 14:03:51 +01:00
Colin Huang edebf3756a Split the entrypoint string to shell-like syntax. 2015-08-25 09:44:47 +08:00
Joffrey F 4bd3c48ea1 Add version param to utils.create_host_config 
Add create_host_config and create_container_config to Client for version
awareness
Trigger warning when create_host_config is used without version
 2015-08-24 16:22:59 -07:00
Mohit Soni 3caaa0050b Added support for cgroup parent 
Clean up cgroup_parent usage
 2015-08-24 14:43:05 -07:00
Joffrey F 4008cbce71 Merge pull request #711 from ClusterHQ/exec_inspect_version 
Change minimum API version for exec_inspect
 2015-08-24 14:19:20 -07:00
Joffrey F cfb20f8d50 Merge pull request #728 from aanand/debug-auth 
Add logging for auth loading/resolution
 2015-08-24 14:03:14 -07:00
Aanand Prasad b5368ad8b9 Add logging for auth loading/resolution 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-20 16:57:40 +01:00
Mark Adams b7aa1d76eb Fixed #726 issue where split_port was checking `len(None)` 
- Fixed #726 by adding a check for None in split_port
- Also switched to using a _raise_invalid_port() function to replace
  multiple slightly differing ValueErrors for invalid port
 2015-08-19 22:01:44 -05:00
Brian Edwards c135266233 add gelf and fluentd logging drivers to types.py 2015-08-18 14:26:32 -05:00
Joffrey F 570693c810 Allow docker host (base_url) to contain a path 2015-08-17 14:36:19 -07:00
Bridget McErlean 7ba83323b6 Update error message to state that exec_inspect is not supported 2015-08-12 23:24:52 +01:00
Stephen Newey 1c1d7eee5a Merge branch 'master' into exec_create_user 2015-08-12 18:12:56 +01:00
Stephen Newey 2febf104a0 Change unnecessary user=None in args to empty string and remove check. 2015-08-12 18:08:12 +01:00
Bridget McErlean eb29b424b0 Change minimum API version for exec_inspect 2015-08-12 11:53:34 +01:00
Joffrey F 139850f3f3 Merge pull request #698 from docker/jhowardmsft-14530-netmode 
`network_mode` now necessary in `host_config`
 2015-08-10 10:53:57 -07:00
Joffrey F 1eaf221391 Explicited start config tricks 2015-08-10 10:45:26 -07:00
Aanand Prasad eff21658b3 Merge pull request #703 from erikced/journald-log-driver 
Add journald log driver support
 2015-08-05 10:25:35 +01:00
Joffrey F 20a7e860b4 unpack key-value pair 2015-08-04 11:31:18 -07:00
Joffrey F 69027f040c dev version 2015-08-04 11:27:36 -07:00
Erik Cederberg 85bdc9c2bd Add journald log driver support 
Signed-off-by: Erik Cederberg <erikced@gmail.com>
 2015-08-03 19:04:55 +02:00
Viktor Petersson d400717ff8 Squashed commit of the following: 
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.
 2015-07-30 14:39:37 +01:00
Joffrey F e32726e83d Moved network_mode default to create_host_config ; small fix to preserve blank host_config in start if no option is provided 2015-07-29 12:45:15 -07:00
Joffrey F 80a97cf2ea development version suffix 2015-07-29 12:40:54 -07:00
Joffrey F be4ea03809 Merge branch '14530-netmode' of https://github.com/jhowardmsft/docker-py into jhowardmsft-14530-netmode 2015-07-29 12:30:53 -07:00
John Howard 8f1a82faeb Add netmode (required by docker) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-28 15:18:12 -07:00
Joffrey F 89c048dc17 Bumped version 2015-07-22 11:23:39 -07:00
Joffrey F f8ad2dabf2 Merge pull request #682 from docker/moutten-fix-build-auth 
Switch to send full AuthConfig object for build action
 2015-07-22 11:11:21 -07:00
Joffrey F 42b712d100 Merge pull request #680 from aanand/fix-timestamp-conversion 
Enforce UTC datetimes in arguments to `events()`
 2015-07-21 10:45:29 -07:00
Aanand Prasad 75cc50f0ad Default to ~/.docker if DOCKER_CERT_PATH is empty 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-21 16:50:44 +01:00
Aanand Prasad 657420a4d3 Enforce UTC datetimes in arguments to `events()` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-21 10:49:27 +01:00
Joffrey F b712e97d4a Added check_resource decorator to exec_create 2015-07-20 14:17:06 -07:00
Joffrey F 4be228653d Make build auth work with API versions < 1.19 too 2015-07-20 14:06:33 -07:00
Joffrey F 7430eb8e65 Merge branch 'fix-build-auth' of https://github.com/moutten/docker-py into moutten-fix-build-auth 2015-07-20 13:56:29 -07:00
Joffrey F 933ee526ba Merge branch 'master' of github.com:docker/docker-py 2015-07-20 13:52:15 -07:00
Joffrey F 915be6ad67 Use constant for deprecation message in auth.py 2015-07-20 13:50:49 -07:00
Aanand Prasad 33e1a58b60 Stop pinging registries from the client 
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>
 2015-07-20 19:50:18 +01:00
Matt Outten ebcfab0a4c Switch to send full AuthConfig object for build action 
In order to support the docker API for version 1.7+, this command
changes the way the `X-Registry-Config` header is sent when attempting
to build an image.
 2015-07-17 15:48:52 -04:00
Lars Kellogg-Stedman 2e546f7e26 return NotFound on 404 errors 
This changes raises docker.errors.NotFound on 404 errors.  This gives
client code the ability to differentiate between "an image does not
exist" and "you are using the api incorrectly".

This inherits from docker.errors.APIError so it will not affect any
existing code.
 2015-07-17 08:31:54 -04:00
Joffrey F 96a5b29a4a Merge branch 'fix-premature-eof' of https://github.com/a-ba/docker-py into a-ba-fix-premature-eof 
Conflicts:
	docker/client.py
 2015-07-09 11:12:01 -07:00
Joffrey F c846d7e1b5 Back to dev version 2015-07-09 11:09:48 -07:00
Joffrey F 7d85f68460 Bumped version to 1.3.0 2015-07-08 15:08:35 -07:00
Joffrey F 826c9e676a Removed execute() method 2015-07-08 15:08:13 -07:00
Dan O'Reilly 70b921f8a3 Fix handling output from tty-enabled containers. 
Treat output from TTY-enabled containers as raw streams, rather than
as multiplexed streams. The docker API docs specify that tty-enabled
containers don't multiplex. Also update tests to pass with these
changes, and changed the code used to read raw streams to not
read line-by-line, and to not skip empty lines.

Addresses issue #630

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-07-06 18:20:41 -04:00
Joffrey F 4f89ca73da ClientBase class to extract utility methods and constructor and sanitize Client class 2015-07-01 00:27:49 +02:00
Joffrey F 2d7f1cfa1e Merge pull request #651 from docker/fix_647 
Fix adapter bug + regression test
 2015-06-30 15:19:14 -07:00
Joffrey F ac90a874be Merge pull request #644 from docker/memory-memswap-hostconfig 
memory / memswap in hostconfig
 2015-06-30 15:06:32 -07:00
Joffrey F 9e87884ba8 Fix Unix socket adapter bug with double slash in path + regression test 2015-06-30 23:59:03 +02:00
Maxime Petazzoni c8c957c983 Merge pull request #661 from docker/fix_640 
Added git@ as a valid prefix for remote build paths
 2015-06-30 14:40:11 -07:00
Stephen Newey a12818a8a8 Add user argument to exec_create documentation. 2015-06-30 13:41:22 +01:00
Stephen Newey 6a5a256509 Add support for user on exec_create. 2015-06-30 13:23:42 +01:00
Joffrey F b959487117 Added git@ as a valid prefix for remote build paths 2015-06-30 03:00:10 +02:00
Joffrey F d300f5f323 Merge pull request #654 from Melraidin/master 
Prefer new Docker config location and format.
 2015-06-29 17:54:02 -07:00
Joffrey F 5375433058 Fix small decorator issue 2015-06-30 02:50:34 +02:00
Joffrey F c2d98c204b Cleanup 2015-06-30 01:49:20 +02:00
Joffrey F 237ce20013 Merge branch 'id-resolution-in-check-resource' of https://github.com/posita/docker-py into posita-id-resolution-in-check-resource 2015-06-30 01:46:22 +02:00
Anthony Baire e132909244 fix premature EOF detection in streams 
The docker engine may send empty chunks of data in the stream
(especially since https://github.com/docker/docker/pull/13033)
They should not be taken for EOF

Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr>
 2015-06-29 20:05:01 +02:00
Kevin Martin 6609586cc6 Prefer new Docker config location and format. 
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
 2015-06-28 23:32:03 -04:00
Joffrey F 30fac5b879 Fix stop timeout bug 2015-06-24 22:58:56 +02:00
Joffrey F 3170277347 Updated websocket-client dependency to latest version (now supports python 3) 2015-06-19 23:09:51 +02:00
Joffrey F 8f43c03586 Support 401 status for v2 registry endpoint 2015-06-19 22:42:43 +02:00
Joffrey F d70aa1e45c Merge branch 'master' of https://github.com/cesanta/docker-py into cesanta-master 2015-06-19 22:36:23 +02:00
Joffrey F 427e3a6023 Moved mem_limit and memswap_limit to host_config for API version >= 1.19 2015-06-19 02:12:32 +02:00
Joffrey F cf06837002 Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into glogiotatidis-pullfix 
Conflicts:
	docker/client.py
 2015-06-19 01:26:49 +02:00
Joffrey F ed07b053e9 Merge pull request #614 from ibuildthecloud/extra-host-list 
Allow extra_hosts to be a list too
 2015-06-18 12:30:21 -07:00
Joffrey F 54e48662a5 Merge pull request #609 from mattmoor/master 
Update docker-py to use a more portable sense of HOME.
 2015-06-18 12:29:08 -07:00
Joffrey F 7e1ce9473e Fixed import style 2015-06-18 21:24:49 +02:00
Joffrey F cd5c8c593a Merge branch 'use-wraps' of https://github.com/ssanderson/docker-py into ssanderson-use-wraps 2015-06-18 21:23:03 +02:00
Joffrey F e05d06bcf2 Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into aanand-allow-any-mode 2015-06-18 21:10:13 +02:00
Joffrey F 6fd391840e Bumped default API version == 1.19 2015-06-18 20:38:52 +02:00
Joffrey F 4ec36c80a9 Only allow volume_driver param if API version >= 1.19 2015-06-18 20:38:52 +02:00
Joffrey F 26531f1f8d Enforce consistent style for push and pull methods 2015-06-18 20:38:52 +02:00
Joffrey F 93531e9cff Bumped version to 1.3.0 (dev) 2015-06-18 20:38:52 +02:00
Philipp Möller 3a32be79d3 Add and document a decode parameter for build 
This makes the build method consistent with the events method and adds
some convenience.
 2015-06-18 20:38:21 +02:00
Bradley Cicenas badc5b69ad Add raise_for_status check to push and pull methods 
as underlying exceptions(such as push already in progress) will be hidden in the stream generator otherwise.
 2015-06-18 20:38:21 +02:00
Luke Marsden 5fa7576e8c Add volume_driver param to client.create_container 
- 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>
 2015-06-18 20:38:21 +02:00
Joffrey F 6f343aa8ea Release 1.2.3 2015-06-18 19:50:31 +02:00
Joffrey F fb5db84f0b Bump RC 2015-06-12 11:31:10 -07:00
Joffrey F 6e3dba99b7 Merge branch 'aanand-allow-binds-list' into 1.3.0-rc0 2015-06-12 11:29:56 -07:00
Aanand Prasad 1446b8c5ee Allow binds to be specified as a list of strings 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-12 12:36:59 -04:00
Aanand Prasad 7dd7625391 Allow any mode string to be passed into a volume bind 
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>
 2015-06-05 13:25:59 +01:00
Scott Sanderson a7c15a8700 Use functools.wraps for check_resource decorator. 
This helps runtime introspection tools like the `help()` builting or
IPython's `?` operator correctly find the underlying method instead of
the decorator definition.
 2015-06-02 11:00:00 -04:00
Giorgos Logiotatidis 739d875854 Fix pull parameter for docker server version < 1.7. 2015-06-01 23:18:27 +03:00
Giorgos Logiotatidis fd1722591b Set default value for pull to False on build(). Fixes 622. 2015-06-01 20:23:17 +03:00
Marko Mikulicic e96ebf8c98 Fix pinging an unauthenticated v2 registry 2015-05-29 00:58:49 +02:00
Darren Shepherd fb2b7078eb Allow extra_hosts to be a list too 
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.
 2015-05-27 08:46:14 -07:00
Joffrey F 7c8e0ed070 Bumped version (rc) 2015-05-26 16:17:57 -07:00
Darren Shepherd 396af7adbe Typo in ReadonlyRootfs 
read_only parameter does not work because the wrong name is sent to Docker
 2015-05-25 20:23:29 -07:00
Matt Moore 9881628ff7 Update docker-py to use a more portable sense of HOME. 
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
 2015-05-21 12:59:38 -07:00
Matt Bogosian 947febcbd8 Move image/container ID resolution to @check_resource decorator. 2015-05-20 15:37:40 -07:00
Joffrey F 7b2fd8cf5e Merge pull request #562 from smothiki/mems 
make memory units compatible with native docker cli
 2015-05-20 15:37:22 -07:00
Joffrey F abbbbfb2d6 Only allow privileged exec_create for API version >= 1.19 2015-05-20 14:58:47 -07:00
Joffrey F e1f93d95c9 Merge branch 'privilege' of https://github.com/tonicbupt/docker-py into tonicbupt-privilege 2015-05-20 14:54:40 -07:00
Joffrey F 9cdf1dc6ef Fixed check_resource decorator 2015-05-20 14:46:33 -07:00
Matt Bogosian de2f58d818 Fix #602. Raise ValueError on empty argument to inspect_{container,image}() methods. 2015-05-17 17:39:25 -07:00
HackToday bf00acf854 Fix the parameter mismatch 
Closes-Issue: #597
 2015-05-12 14:40:12 +08:00
Maxime Petazzoni fc174769aa Fix typo in deprecated insert method. Fixes #595 
s/fornat/format/
 2015-05-11 09:45:31 -07:00
Joffrey F 329662c53e Merge pull request #593 from docker/deprecate_start_hostconfig 
Deprecate start hostconfig
 2015-05-08 14:32:42 -07:00
Joffrey F 2fd2eebcb0 Added deprecation warning for host config in start 2015-05-08 14:00:58 -07:00
Joffrey F 53aa77fd3a Set 'CpusetCpus' with the value of the cpuset param in create_container 2015-05-08 11:32:36 -07:00
smothiki ef452ed4c1 make memory units compatible with native docker cli 
Signed-off-by: sivaram mothiki <smothiki@engineyard.com>
 2015-05-07 20:05:32 -06:00
tonic 51dac059eb add privilege for exec_create 2015-05-08 09:25:03 +08:00
Joffrey F 2fdc433dc0 dev version 2015-05-06 18:04:18 -07:00
Joffrey F 0b99e53595 Bumped version 2015-05-04 11:47:07 -07:00
Joffrey F 0b78d7a841 Merge pull request #576 from ctrlhxj/fix_exec_resize 
exec_resize is incorrectly passing param as json
 2015-04-30 13:13:30 -07:00
Joffrey F 07c37171e4 Merge pull request #577 from pmoosh/master 
Update client.py
 2015-04-30 13:12:10 -07:00
Joffrey F 1724522f4c back to dev version 2015-04-30 13:09:48 -07:00
Peter Mooshammer a266448b00 Update client.py 2015-04-29 15:30:33 -07:00
Xiaojian Huang b9909c68f9 exec_resize is incorrectly passing param as json 2015-04-28 19:50:15 -07:00
Joffrey F e5ce67e72f Bumped version, changelog 2015-04-28 10:48:09 -07:00
Joffrey F f6b816c264 Fix #573 2015-04-28 10:48:09 -07:00
Joffrey F aceb7a69b5 Merge pull request #572 from dlorenc/master 
Change decorators to use a relative import.
 2015-04-28 10:08:09 -07:00
Joffrey F d74d38cf23 Back to dev version 2015-04-28 10:07:07 -07:00
dlorenc a7b2a1bff3 Change decorators to use a relative import. 
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>
 2015-04-27 18:57:48 -07:00
Joffrey F 0f30ee06cb Bumped version 2015-04-27 17:39:21 -07:00
Joffrey F ae329cb3ac * Separate file to store constants 
* Added container_limits param to Client.build
 2015-04-27 16:24:42 -07:00
Joffrey F e337a2317e Updated exec API documentation 2015-04-27 14:11:43 -07:00
Joffrey F e2ad91bdf7 Exec API tests 2015-04-27 13:57:15 -07:00
Joffrey F 0fd70b47e3 Properly implement exec API 2015-04-27 12:36:18 -07:00
Joffrey F 2b153a63c8 Merge pull request #564 from docker/check_resource_not_none 
Added check_resource decorator
 2015-04-27 11:29:05 -07:00
Joffrey F 019751daa8 Use custom Error class (inherits DockerException and ValueError) 2015-04-27 11:26:45 -07:00
Pahaz Blinov 1e41b67226 fix(client.py): unification the container argument 2015-04-26 09:24:22 +05:00
Joffrey F c2d48652ce Added check_resource decorator to interrupt command if container or image argument is None 2015-04-24 15:56:35 -07:00
Joffrey F 185fceda7b Merge pull request #563 from docker/logconfig-support 
Logconfig support
 2015-04-24 15:22:29 -07:00
Joffrey F 53cfe633db v2 doesn't have a /_ping endpoint, use /v2/ instead. Fixes #549 2015-04-24 15:21:17 -07:00
Joffrey F 21d80b16dd Added log_config support in host config 2015-04-24 14:56:06 -07:00
Joffrey F 6228929a88 Handle ID truncate on client side in containers list (and changed default from True to False) 2015-04-22 18:00:53 -07:00
Joffrey F d87577c7c6 improved Ulimit class 2015-04-22 15:45:38 -07:00
Joffrey F 857614fb1a Add support for ulimits in host_config 2015-04-22 15:13:25 -07:00
Joffrey F b46e4a398b Modify expand_registry_url to support v2 private registries. 2015-04-22 13:56:35 -07:00
Joffrey F a5519022d9 Merge branch 'sam/import-improvements' of https://github.com/ssssam/docker-py into ssssam-sam/import-improvements 
Conflicts:
	docker/client.py
	docker/unixconn/unixconn.py
	tests/integration_test.py
 2015-04-22 11:50:45 -07:00
Joffrey F 1445956010 Merge branch 'pull_auth' of https://github.com/hibooboo2/docker-py into hibooboo2-pull_auth 2015-04-22 11:18:46 -07:00
Joffrey F cab86bb170 Automatically generate version_info from version string 2015-04-22 11:14:32 -07:00
Joffrey F 4c16b752d0 Merge branch 'version_info' of https://github.com/terminalmage/docker-py into terminalmage-version_info 2015-04-22 11:11:11 -07:00
Joffrey F 0bb5ed5c24 Merge pull request #530 from dlorenc/master 
Add assert_fingerprint option.
 2015-04-22 11:10:03 -07:00
Joffrey F cf0537e183 Merge pull request #537 from onorua/master 
IPC sharing implementation
 2015-04-22 11:09:03 -07:00
Yuval Kohavi baadad05ad removed unneeded imports 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-04-17 17:09:45 -04:00
Erik Johnson 99e1ee452e Add a version_info attribute 
This makes comparing docker-py versions *much* easier. Having to account
for the potential of a "-dev" suffix is a PITA.
 2015-04-03 17:24:02 -05:00
Yuval Kohavi 278e801b89 Adding port utils to split port ranges 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-04-03 17:23:50 +03:00
Yaroslav Molochko 48a19c3129 IPC sharing implementation 2015-03-30 09:29:18 +03:00
Joffrey F 1845d3b13f Added some type and version checks; removed security_opt from container_config (as this is invalid) 2015-03-25 15:19:06 -07:00
Eric Windisch 24b0cab2dc Add security_opt for create/start 
Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-03-24 17:07:53 -04:00
Joffrey F 70ce156e26 Merge branch 'master' of github.com:docker/docker-py 2015-03-20 16:17:38 -07:00
Joffrey F adf5a1cfc6 Use get instead of bracket notation 2015-03-20 16:17:15 -07:00
Joffrey F c0df903af1 Merge branch 'fix-port-host-net' of https://github.com/ssanderson/docker-py into ssanderson-fix-port-host-net 2015-03-20 15:58:30 -07:00
Joffrey F 96440cccb0 Merge pull request #531 from josephpage/dockerignore-eof-windows 
Windows : fix EOL of .dockerignore file
 2015-03-20 15:56:50 -07:00
Joffrey F 0e8fc634b2 Merge pull request #532 from aanand/labels 
Labels
 2015-03-20 15:56:20 -07:00
Joffrey F 645c84e65d Back to dev version 2015-03-20 15:56:04 -07:00
Aanand Prasad bd72bd13c7 Finish labels implementation, add tests and docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:42:10 -07:00
Aanand Prasad 014dba2841 Update default API version to 1.18 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 14:49:42 -07:00