Commit Graph

3158 Commits

Author SHA1 Message Date
Aanand Prasad 3e2f4a6142 Refactors
- `read_data()` raises an exception instead of asserting `False`
- `next_packet_size()` uses `read_data()`
- Renamed `packet_size` arg to `n` for consistency

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
Aanand Prasad 43158cfe3f Move read_loop() into docker.utils.socket.read_iter()
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
Aanand Prasad b100666a3c Remove duplicated methods from container.py
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
Aanand Prasad 73f06e3335 Move socket-reading test helpers into docker.utils.socket
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
Joffrey F e64ba8f2b9 Mock read_from_socket method
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-13 17:08:17 -04:00
Joffrey F 76ed9c37cd Read from socket after sending TCP upgrade headers.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-13 17:08:17 -04:00
David Gageot 5464cf2bea Add hijack hints for non-detached exec api calls
Signed-off-by: David Gageot <david@gageot.net>
2016-07-13 17:08:17 -04:00
David Gageot 6dec639a1a Add hijack hints for attach api calls
Signed-off-by: David Gageot <david@gageot.net>
2016-07-13 17:08:16 -04:00
Daniel Nephin b511352bea Merge pull request #1115 from TomasTomecek/create-volume-support-labels
volumes,create: support adding labels
2016-07-13 13:44:37 -04:00
Tomas Tomecek 8f8a3d0ed2 volumes,create: support adding labels
Fixes #1102

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-07-13 08:41:45 +02:00
Aanand Prasad 1f34b4896a Merge pull request #1119 from Mobelux/fix-build-with-auth
Pass X-Registry-Auth when building an image
2016-07-12 16:38:06 -04:00
Justin Michalicek e8ea79dfdb Change double underscore in test case names for _set_auth_headers
* Change test__set_auth_headers_* methods to test_set_auth_headers_*

Signed-off-by: Justin Michalicek <jmichalicek@gmail.com>
2016-07-12 10:06:34 -04:00
Justin Michalicek f7807bdb52 Update build unit tests
* Test that the request from build when the client has
  auth configs contains the correct X-Registry-Config header
* Test that BuildApiMixin._set_auth_headers() updates the passed
  in headers dict with auth data from the client
* Test that BuildApiMixin._set_auth_headers() leaves headers dict intact
  when there is no _auth_config on the client.

Signed-off-by: Justin Michalicek <jmichalicek@gmail.com>
2016-07-12 10:06:34 -04:00
Justin Michalicek 66e7af9353 Pass X-Registry-Auth when building an image
* Initialize headers variable in BuildApiMixin.build() as a dict rather
  than as None.  This way the correct object gets passed to
  _set_auth_headers() even if no headers were set in build()

* Changing object from None to {} in BuildApiMixin._set_auth_headers()
  removed because it changes the object reference, so has no effect on
  calling code.

Signed-off-by: Justin Michalicek <jmichalicek@gmail.com>
2016-07-12 10:06:34 -04:00
Joffrey F 5e47026a9b Merge pull request #1122 from Faylixe/patch-3
Update api.md
2016-07-08 13:11:35 -07:00
Faylixe c8c6f0073e Removed superfluous sentence
Signed-off-by: Faylixe <felix.voituret@gmail.com>
Signed-off-by: Félix Voituret <felix.voituret@gmail.com>
2016-07-08 21:46:02 +02:00
Faylixe 6d347cd894 Update api.md
Added ``buildargs`` parameter to ``build`` documentation

Signed-off-by: Faylixe <felix.voituret@gmail.com>
2016-07-08 10:44:49 +02:00
Srikalyan Swayampakula b5d3556bce Added support for user namespace.
Signed-off-by: Srikalyan Swayampakula <srikalyansswayam@gmail.com>
2016-06-30 15:25:17 -07:00
Joffrey F 0f15c6599d Bump to 1.9.0-rc2
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 14:54:37 -07:00
Joffrey F e8ef5e513b Merge pull request #1111 from docker/1.9.0-release
Cherry-pick signal fix into 1.9.0 release branch
2016-06-28 14:53:06 -07:00
Joffrey F 0d8624b49b Add integration tests for different types of kill signals
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 13:29:37 -07:00
Joffrey F 4ed90bc8b8 Fix network aliases test with Engine 1.12
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 13:29:37 -07:00
Joffrey F 900703ef2f signal in Client.kill can be a string containing the signal's name
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 13:29:37 -07:00
Aanand Prasad 94f8dd31be Merge pull request #1109 from docker/signal-str
signal in Client.kill can be a string containing the signal's name
2016-06-28 13:03:38 -07:00
Joffrey F d96d848bb4 Add integration tests for different types of kill signals
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 12:03:44 -07:00
Joffrey F 1132368be1 Fix network aliases test with Engine 1.12
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 11:05:01 -07:00
Joffrey F 5480493662 signal in Client.kill can be a string containing the signal's name
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 11:03:52 -07:00
Joffrey F 986a14a152 Merge pull request #1108 from docker/1107-link-local-ips
Add support for link-local IPs in endpoint config
2016-06-27 12:30:14 -07:00
Joffrey F 0de366da3d Add support for link-local IPs in endpoint config
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-24 15:17:58 -07:00
Aiden Luo 7d9bb6d209 fix #1094, support PidsLimit in host config
Signed-off-by: Aiden Luo <aiden0xz@gmail.com>
2016-06-17 11:20:39 +08:00
Joffrey F 9010d59450 Merge pull request #1096 from docker/1.9.0-release
Release (candidate) 1.9.0
2016-06-16 12:53:45 -07:00
Joffrey F a2160145cf 1.9.0 RC1
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-16 12:46:46 -07:00
Joffrey F 538a1db9dd Merge pull request #1066 from yunzhu-li/blkio-control
Add support for Block IO constraints in HostConfig
2016-06-15 14:26:49 -07:00
Joffrey F 787f3f5a16 Merge pull request #1079 from docker/1024-npipe-support
npipe support
2016-06-14 12:05:35 -07:00
Joffrey F 080b4711f2 Merge pull request #1083 from docker/1042-ip-networking-config
Support ipv4_address and ipv6_address in create_endpoint_config
2016-06-13 18:02:58 -07:00
Joffrey F f4de376341 Merge pull request #1090 from docker/1080-inspect-image-docs
Fix param name for inspect_image in API docs
2016-06-13 18:02:06 -07:00
Joffrey F d991db5b45 Expand on the 1-network limit in create_container
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 17:58:10 -07:00
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 b050544237 Fix param name for inspect_image in API docs
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-09 13:01:29 -07:00
Joffrey F a8746f7a99 Remove obsolete, commented out code
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-08 17:02:33 -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
Massimiliano Pippi 86d1b8fb83 invoke self._result with json=True if decode=True
Signed-off-by: Massimiliano Pippi <massi@datadoghq.com>
2016-06-07 10:32:02 -04:00
yunzhu-li 896d36ea1d
Add support for Block IO constraints in HostConfig
This adds support for Block IO constraint options:
    - blkio-weight
    - blkio-weight-device
    - device-read-bps
    - device-write-bps
    - device-read-iops
    - device-write-iops

Signed-off-by: yunzhu-li <contact@yunzhu.li>
2016-06-05 23:30:44 -04:00
Joffrey F 0176fa171f Update parse_host and tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-02 18:21:29 -07:00
Joffrey F d922713923 Reorganize docker.transport package
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-02 17:59:50 -07:00
Joffrey F b5d9312f9a npipe support cleanup
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-02 17:59:50 -07:00
Joffrey F 4a8832ca8b pypiwin32 added to requirements
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-02 17:59:50 -07:00
Joffrey F a34e0cbfaa Experimental npipe:// support
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-02 17:59:50 -07:00