Joffrey F
fc4bfde0d6
Unify endpoint config creation when using connect_container_to_network
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 17:58:10 -07:00
Joffrey F
b6fa986293
Add ipv[46]_address params to create_endpoint_config.
...
Update networks documentation with exhaustive API docs
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 17:58:10 -07:00
Joffrey F
299ffadb95
Merge pull request #1084 from adamchainz/readthedocs.io
...
Convert readthedocs links for their .org -> .io migration for hosted projects
2016-06-08 10:17:58 -07:00
Adam Chainz
7f255cd295
Convert readthedocs links for their .org -> .io migration for hosted projects
...
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/ ) ‘Securing subdomains’:
> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
Test Plan: Manually visited all the links I’ve modified.
Signed-off-by: Adam Chainz <adam@adamj.eu>
2016-06-08 03:48:04 +01:00
Daniel Nephin
88811a2659
Merge pull request #1071 from graingert/support-py35
...
support Python 3.5
2016-05-25 14:56:06 -04:00
Thomas Grainger
98093544a7
support new Py3.5 Enum signals
...
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2016-05-19 18:19:33 +01:00
Thomas Grainger
7e24304934
update docs to py3.5
...
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2016-05-19 18:04:46 +01:00
Thomas Grainger
e0b9cb2a8c
support Python 3.5
...
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2016-05-19 17:59:34 +01:00
Joffrey F
26f2b696ab
Merge pull request #1068 from jgiannuzzi/internal_networks
...
Add support for creating internal networks
2016-05-18 13:39:28 -07:00
Jonathan Giannuzzi
98b41fee3c
Add support for creating internal networks
...
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
2016-05-18 16:25:43 +02:00
Joffrey F
966dfac3b5
Merge pull request #1065 from aanand/fix-dockerignore-path-traversal
...
Resolve path traversal in .dockerignore patterns
2016-05-16 14:09:50 -07:00
Aanand Prasad
5ebf4b8ec7
Resolve path traversal in .dockerignore patterns
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-05-16 15:55:06 +01:00
Joffrey F
8b416796d5
Merge pull request #1057 from kevinfrommelt/socket-timeout
...
Don't set socket timeout if it's already disabled when streaming
2016-05-10 15:01:50 -07:00
Kevin Frommelt
2826dd51e7
Don't set socket timeout if it's already disabled when streaming
...
Signed-off-by: Kevin Frommelt <kevin.frommelt@gmail.com>
2016-05-10 10:23:14 -05:00
Joffrey F
b98e240958
Merge pull request #1051 from docker/1.8.1-release
...
1.8.1 release
2016-04-29 15:20:19 -07:00
Joffrey F
d6e70e2c40
Update ChangeLog and version.py (1.8.1)
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-28 17:15:20 -07:00
Joffrey F
5df7b317e4
Merge pull request #1050 from docker/1044-fix-login-default
...
Let server-side determine which serveraddress to use when unspecified
2016-04-28 17:07:11 -07:00
Joffrey F
50a6a47186
Let server-side determine which serveraddress to use when none is specified
...
in login()
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-28 16:53:01 -07:00
Joffrey F
3c02fc4cc7
Merge pull request #1004 from klj613/allow-equals-character-in-env-file
...
makes it possible to have '=' in the env file
2016-04-27 16:27:28 -07:00
Joffrey F
237f5318f2
Removed obsolete env var in integration-dind target command
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-26 14:32:49 -07:00
Joffrey F
02803afac4
Add -dev suffix to version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-22 15:01:58 -07:00
Joffrey F
4d0a3d9cc5
Merge pull request #1039 from docker/felixonmars-backports
...
Use backports.ssl_match_hostname
2016-04-21 13:52:38 -07:00
Joffrey F
d80e75f5ea
Merge pull request #1017 from SakuraSound/container-docs
...
Added extra filtering options to containers command in ClientAPI
2016-04-20 10:25:56 -07:00
Joir-dan Gumbs
1c8ce07785
Added link to docker ps documentation
...
Signed-off-by: Joir-dan Gumbs <jdagumbs@gmail.com>
2016-04-19 23:19:55 -07:00
Joffrey F
c76a914e01
Only install ipaddress if python version < 3.3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-19 17:15:51 -07:00
Joir-dan Gumbs
923536a168
rebased documentation changes against master fork
...
Signed-off-by: Joir-dan Gumbs <jdagumbs@gmail.com>
2016-04-18 21:39:55 -07:00
Felix Yan
cba2e973ec
Require ipaddress on Python < 3.5
...
Signed-off-by: Felix Yan <felixonmars@archlinux.org>
2016-04-08 00:36:54 +08:00
Felix Yan
9da5493135
Use backports.ssl_match_hostname
...
The py2-ipaddress module unfortunately conflicts with the pypi:ipaddress module, which is in the dependency tree of widely used pyOpenSSL. I think it would be a good idea to use a well maintained backport of the Python 3.5 implementation of match_hostname() instead of duplicating the effort and maintain another.
All tests are passing here.
Signed-off-by: Felix Yan <felixonmars@archlinux.org>
2016-04-08 00:36:46 +08:00
Joffrey F
fdd118706a
Merge pull request #1025 from docker/1.8.0-release
...
1.8.0 release
2016-04-06 13:20:42 -07:00
Joffrey F
267bd34426
Bump version to 1.8.0
...
Add RC bugfixes to the changelog.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-05 16:21:16 -07:00
Joffrey F
f68a4f957d
Merge pull request #1022 from docker/1021-empty-auth
...
Don't raise InvalidConfigError when auth dict doesn't have an 'auth' key
2016-04-05 15:00:32 -07:00
Joffrey F
541edd7ffb
Don't raise InvalidConfigError when auth dict doesn't have an 'auth' key
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-05 14:05:33 -07:00
Joffrey F
e743254b42
Merge pull request #1020 from mschnitzer/fix_little_error
...
Remove not needed dot in README.md
2016-04-05 10:48:37 -07:00
Manuel Schnitzer
1112e1e314
Remove not needed dot in README.md
...
Signed-off-by: Manuel Schnitzer <mschnitzer@suse.de>
2016-04-05 12:44:11 +02:00
Joffrey F
035e9e1c91
Bump RC
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-31 17:48:56 -07:00
Joffrey F
77625150bc
Merge pull request #1018 from aanand/fix-py2-ipaddress-dependency
...
Fix py2-ipaddress dependency
2016-03-31 17:47:55 -07:00
Aanand Prasad
26cd4d6f2e
Fix py2-ipaddress dependency
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-31 18:22:18 +01:00
Joffrey F
14423d2b54
Bump RC
...
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joir-dan Gumbs <jgumbs@us.ibm.com>
2016-03-30 22:25:45 -07:00
Joir-dan Gumbs
d6b42c480e
Added extra filtering options to containers command in ClientAPI
...
Signed-off-by: Joir-dan Gumbs <jdagumbs@gmail.com>
Signed-off-by: Joir-dan Gumbs <jgumbs@us.ibm.com>
2016-03-30 22:25:20 -07:00
Joffrey F
b19321da9c
Bump RC
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 17:18:04 -07:00
Joffrey F
3162c7835c
Merge pull request #1015 from aanand/fix-port-binding-doc
...
Improve port binding docs
2016-03-30 11:39:33 -07:00
Joffrey F
88b5ed781c
Merge branch 'master' of github.com:docker/docker-py
2016-03-30 11:37:52 -07:00
Joffrey F
241793b101
Use pip environment markers for conditional dependencies
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 11:37:17 -07:00
Joffrey F
079ed9f786
Bump RC
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 10:56:17 -07:00
Joffrey F
88790781cd
Merge pull request #1013 from docker/hostname_ip_matching
...
Hostname IP matching
2016-03-30 10:54:03 -07:00
Aanand Prasad
449e037de3
Improve port binding docs
...
- Reword a sentence that was wrong ("container" and "host" were the
wrong way round)
- Put the multiple-ports example before the multiple-IPs example
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-30 11:23:07 +01:00
Joffrey F
ac3d4aae2c
Different requirements.txt in Dockerfile-py3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 17:36:10 -07:00
Joffrey F
a6c1d7b751
flake8 fixes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 17:09:37 -07:00
Joffrey F
c5a92e0822
Tests for match_hostname backport
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 17:09:26 -07:00
Joffrey F
0a5815bcad
Add match_hostname implementation and monkey-patch for py<3.5
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 17:08:31 -07:00