summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add support for IPv6 docker host connections.1135-ipv6-docker-hostJoffrey F2016-07-272-21/+27
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* dev versionJoffrey F2016-07-261-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'release'Joffrey F2016-07-262-1/+3
|\
| * Merge pull request #1140 from docker/1.9.0-release1.9.0Joffrey F2016-07-262-1/+3
| |\ | | | | | | Bump to 1.9.0
| | * Bump to 1.9.01.9.0-releaseJoffrey F2016-07-262-1/+3
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Set custom user agent on clientBen Firshman2016-07-264-1/+37
| | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * Bump to 1.9.0-rc21.9.0-rc2Joffrey F2016-06-281-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Merge pull request #1111 from docker/1.9.0-releaseJoffrey F2016-06-283-7/+42
| |\ | | | | | | Cherry-pick signal fix into 1.9.0 release branch
| | * Add integration tests for different types of kill signalsJoffrey F2016-06-281-0/+30
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * Fix network aliases test with Engine 1.12Joffrey F2016-06-281-6/+9
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| | * signal in Client.kill can be a string containing the signal's nameJoffrey F2016-06-281-1/+3
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1137 from aanand/default-to-npipe-on-windowsJoffrey F2016-07-262-3/+5
|\ \ | | | | | | Default to npipe address on Windows
| * | Default to npipe address on WindowsAanand Prasad2016-07-262-3/+5
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #1139 from docker/compose-3757-linklocal-fixAanand Prasad2016-07-262-4/+25
|\ \ | | | | | | Send LinkLocalIPs as part of IPAMConfig dictionary
| * | Send LinkLocalIPs as part of IPAMConfig dictionarycompose-3757-linklocal-fixJoffrey F2016-07-252-4/+25
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1133 from kmala/masterAanand Prasad2016-07-223-10/+45
|\ \ | | | | | | Add optional auth config to docker push
| * | Add unit testsKeerthan Reddy Mala2016-07-221-0/+26
| | | | | | | | | | | | Signed-off-by: Keerthan Reddy Mala <kmala@deis.com>
| * | Add optional auth config to docker pushKeerthan Reddy Mala2016-07-222-10/+19
|/ / | | | | | | Signed-off-by: Keerthan Reddy Mala <kmala@deis.com>
* | Merge pull request #1125 from bfirsh/user-agentAanand Prasad2016-07-224-1/+37
|\ \ | | | | | | Set custom user agent on client
| * | Set custom user agent on clientBen Firshman2016-07-204-1/+37
|/ / | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1130 from aanand/support-tcp-upgradeAanand Prasad2016-07-189-63/+153
|\ \ | | | | | | Support for TCP upgrade
| * | Rename read methods for clarityAanand Prasad2016-07-133-9/+10
| | | | | | | | | | | | | | | | | | | | | read_socket() is now just read(), because its behaviour is consistent with `os.read` et al. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Rename read_iter() to frames_iter()Aanand Prasad2016-07-132-4/+4
| | | | | | | | | | | | | | | | | | | | | This makes it more clearly high-level and distinct from the raw data-reading functions Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Rename next_packet_size to next_frame_sizeAanand Prasad2016-07-133-7/+7
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Reorder socket.py methodsAanand Prasad2016-07-131-13/+13
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Remove unused importsAanand Prasad2016-07-131-4/+1
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Document all socket utility methodsAanand Prasad2016-07-131-2/+14
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | RefactorsAanand Prasad2016-07-131-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | - `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>
| * | Move read_loop() into docker.utils.socket.read_iter()Aanand Prasad2016-07-132-12/+11
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Remove duplicated methods from container.pyAanand Prasad2016-07-131-31/+1
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Move socket-reading test helpers into docker.utils.socketAanand Prasad2016-07-134-50/+58
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Mock read_from_socket methodJoffrey F2016-07-131-1/+6
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Read from socket after sending TCP upgrade headers.Joffrey F2016-07-134-9/+66
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add hijack hints for non-detached exec api callsDavid Gageot2016-07-132-3/+39
| | | | | | | | | | | | Signed-off-by: David Gageot <david@gageot.net>
| * | Add hijack hints for attach api callsDavid Gageot2016-07-131-2/+8
|/ / | | | | | | Signed-off-by: David Gageot <david@gageot.net>
* | Merge pull request #1115 from TomasTomecek/create-volume-support-labelsDaniel Nephin2016-07-134-4/+41
|\ \ | | | | | | volumes,create: support adding labels
| * | volumes,create: support adding labelsTomas Tomecek2016-07-134-4/+41
|/ / | | | | | | | | | | Fixes #1102 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | Merge pull request #1119 from Mobelux/fix-build-with-authAanand Prasad2016-07-122-4/+63
|\ \ | | | | | | Pass X-Registry-Auth when building an image
| * | Change double underscore in test case names for _set_auth_headersJustin Michalicek2016-07-121-3/+3
| | | | | | | | | | | | | | | | | | * Change test__set_auth_headers_* methods to test_set_auth_headers_* Signed-off-by: Justin Michalicek <jmichalicek@gmail.com>
| * | Update build unit testsJustin Michalicek2016-07-121-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | Pass X-Registry-Auth when building an imageJustin Michalicek2016-07-121-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge pull request #1122 from Faylixe/patch-3Joffrey F2016-07-081-0/+1
|\ \ | | | | | | Update api.md
| * | Removed superfluous sentenceFaylixe2016-07-081-2/+0
| | | | | | | | | | | | | | | Signed-off-by: Faylixe <felix.voituret@gmail.com> Signed-off-by: Félix Voituret <felix.voituret@gmail.com>
| * | Update api.mdFaylixe2016-07-081-0/+3
|/ / | | | | | | | | | | Added ``buildargs`` parameter to ``build`` documentation Signed-off-by: Faylixe <felix.voituret@gmail.com>
* | Merge pull request #1109 from docker/signal-strAanand Prasad2016-06-283-7/+42
|\ \ | | | | | | signal in Client.kill can be a string containing the signal's name
| * | Add integration tests for different types of kill signalsJoffrey F2016-06-281-0/+30
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Fix network aliases test with Engine 1.12signal-strJoffrey F2016-06-281-6/+9
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | signal in Client.kill can be a string containing the signal's nameJoffrey F2016-06-281-1/+3
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1108 from docker/1107-link-local-ipsJoffrey F2016-06-274-3/+23
|\ \ | |/ |/| Add support for link-local IPs in endpoint config
| * Add support for link-local IPs in endpoint config1107-link-local-ipsJoffrey F2016-06-244-3/+23
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status