Mike Dougherty
387db11009
Re-write kwargs_from_env to handle TLS options better
...
This more closely matches the way the docker client interprets the
relevant environment variables. Among other things, it's now possible to
set DOCKER_TLS_VERIFY=false.
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2016-02-04 17:13:09 -08:00
Joffrey F
bba8e28f82
Merge pull request #923 from nubs/master
...
Add support for shm_size.
2016-02-04 14:28:09 -08:00
Joffrey F
084f758212
Back to dev version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-04 14:26:09 -08:00
Spencer Rinehart
fca622cad7
Add support for shm_size.
...
--shm-size was added to Docker in 1.10 via docker/docker#16168 . See
docker/compose#2823 for more details.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-04 12:33:05 -06:00
Joffrey F
60d814d742
Merge pull request #922 from docker/release-1.7.0
...
Release 1.7.0
2016-02-04 09:52:49 -08:00
Joffrey F
a11dc87bd3
Bump to stable version
...
Update ChangeLog
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-04 09:39:02 -08:00
Joffrey F
a6a562a681
Merge pull request #915 from docker/914_hostconfig_start
...
Update outdated error message
2016-02-01 10:35:33 -08:00
Joffrey F
cf5755da45
Update outdated error message
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-29 17:26:10 -08:00
Aanand Prasad
818291ecbb
Merge pull request #912 from docker/495_port_bindings_advanced_doc
...
Advanced documentation for port bindings
2016-01-29 17:03:13 +00:00
Daniel Nephin
ebec62d5f8
Merge pull request #911 from docker/894-docker_host_env
...
Support unspecified protocol in base_url when using TLS
2016-01-29 10:20:45 -05:00
Joffrey F
41d049a11c
Advanced documentation for port bindings
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-28 17:55:36 -08:00
Joffrey F
bb94fe7a8c
Support unspecified protocol in base_url when using TLS
...
(assume HTTPS)
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-28 16:25:23 -08:00
Joffrey F
446e6d08dd
Bump RC
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-26 11:04:43 -08:00
Joffrey F
9b3b096709
Merge pull request #906 from aanand/capture-stdout-stderr
...
Re-enable stdout/stderr capturing in tests
2016-01-25 10:32:13 -08:00
Joffrey F
a909e2e5ee
Merge pull request #907 from aanand/raise-for-status-connect-disconnect
...
Raise exceptions for API errors on network connect/disconnect
2016-01-25 10:31:14 -08:00
Aanand Prasad
403d271cc2
Raise exceptions for API errors on network connect/disconnect
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 18:19:32 +00:00
Aanand Prasad
464b9bcdc3
Re-enable stdout/stderr capturing in tests
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 11:43:23 +00:00
Joffrey F
ce8a02f713
Bumped RC
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-21 17:50:53 -08:00
Aanand Prasad
afc64d3b5c
Merge pull request #902 from docker/py32_deprecation
...
Drop support for python 3.2
2016-01-21 11:35:52 +00:00
Joffrey F
ae6069eea7
Drop support for python 3.2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-20 12:02:14 -08:00
Joffrey F
4b8d4358bb
Merge pull request #901 from aanand/networking-links
...
Support links (container-local aliases) when creating containers or connecting to networks
2016-01-20 11:50:33 -08:00
Aanand Prasad
01a754a7f7
Support links when creating containers or connecting to networks
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-20 17:47:45 +00:00
Joffrey F
656e6cffb6
1.7.0 release candidate
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-18 14:44:47 -08:00
Joffrey F
eb1f24a1fc
Merge pull request #880 from docker/813-parse-float-bytes
...
Handle 64-bit integer values in parse_bytes
2016-01-18 14:37:34 -08:00
Joffrey F
8c533bf25e
Merge pull request #899 from docker/http-headers-support
...
Add HttpHeaders support
2016-01-18 14:35:16 -08:00
Pavel Kravchenko
84a72f49e9
Add HttpHeaders support in load_config
...
Signed-off-by: Pavel Kravchenko <kpavel@il.ibm.com>
2016-01-18 14:29:31 -08:00
Joffrey F
cd66f6c6cd
parse_bytes: Add ability to handle 64-bit integers in py2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-18 13:53:52 -08:00
Aanand Prasad
57b79cb1e7
Merge pull request #889 from docker/725-devices-format
...
Improve host devices support
2016-01-18 20:49:59 +00:00
Joffrey F
f9b04c1026
Improve host devices support
...
Add unit tests for utils.parse_devices
Rewrite documentation
Support dict and string format for device declaration
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-18 11:38:32 -08:00
Joffrey F
2f2d50d0c7
Merge pull request #898 from docker/https_docs_link
...
Update HTTPS docs link
2016-01-18 11:27:39 -08:00
Aanand Prasad
36e302cd90
Merge pull request #897 from aanand/network-options
...
Normalise/fix networking API JSON keys
2016-01-18 19:22:24 +00:00
Joffrey F
426f66af1c
Update HTTPS docs link
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-18 11:21:12 -08:00
Aanand Prasad
21a5a0a049
Normalise/fix networking API JSON keys
...
- Use CamelCase
- `auxaddresses` -> `AuxiliaryAddresses`
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 18:41:18 +00:00
Aanand Prasad
bd658f7f7f
Merge pull request #895 from aanand/alias
...
Implement support for network-scoped aliases
2016-01-14 22:05:08 +00:00
Aanand Prasad
d00a5bb086
Implement support for network-scoped aliases
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 18:19:35 +00:00
Daniel Nephin
e2878cbcc3
Merge pull request #892 from docker/base_url_none
...
Don't break if base_url == None and TLS is enabled
2016-01-11 11:18:42 -05:00
Joffrey F
6078040318
Don't break if base_url == None and TLS is enabled
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-08 16:41:15 -08:00
Aanand Prasad
62d9964cc1
Merge pull request #818 from rmb938/patch-1
...
allow custom ipam options when creating networks
2016-01-05 12:55:45 +00:00
Joffrey F
140879d657
Merge pull request #888 from wenchma/18626-sync_inspect_network
...
Update the test_inspect_network
2016-01-04 18:03:43 -08:00
Ryan Belgrave
67a29441c4
allow custom ipam options when creating networks
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-04 18:57:11 -05:00
Joffrey F
ee0788e4ad
Merge pull request #882 from docker/881-hostconfig_doc
...
Add cpu_quota and cpu_period to the HostConfig documentation
2016-01-04 14:52:23 -08:00
wenchma
c424148853
Update docker network inspect test
...
This is based on https://github.com/docker/docker/pull/18928
Related to docker/docker#18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-30 10:43:02 +08:00
Joffrey F
57512760c8
Merge pull request #884 from docker/stop_test_update
...
Don't expect non-zero exit code when stopping a container
2015-12-23 13:09:20 -08:00
Joffrey F
8b322aea2b
Don't expect non-zero exit code when stopping a container
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-12-23 13:01:05 -08:00
Daniel Nephin
3ff27a8f5c
Merge pull request #883 from joshpurvis/jp-since-docs
...
Add docs for since argument in container logs method
2015-12-23 12:41:39 -08:00
Josh Purvis
d388abe3b3
Add docs for argument when retrieving container logs
...
Signed-off-by: Josh Purvis <jpurvis@kwantera.com>
2015-12-23 11:41:59 -05:00
Joffrey F
7724e36e1b
Add cpu_quota and cpu_period to the HostConfig documentation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-12-22 17:43:03 -08:00
Aanand Prasad
9deffc45a1
Merge pull request #863 from thomasboyt/fast-exclude-paths
...
Don't descend into ignored directories when building context
2015-12-16 16:59:12 +00:00
Aanand Prasad
1dae8ef09a
Merge pull request #874 from aanand/fix-index.docker.io
...
Treat 'index.docker.io' repo names as 'docker.io'
2015-12-16 15:08:55 +00:00
Aanand Prasad
25b188440a
Treat 'index.docker.io' repo names as 'docker.io'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-12-10 12:42:54 +00:00