minzhang
44868fa0fa
Added support for docker swarm api version 1.24.
...
3 API are added
swarm_init()
swarm_leave()
swarm_join()
Signed-off-by: Min Zhang<minzhang.work@gmail.com>
Signed-off-by: Min Zhang <virgilerin@gmail.com>
2016-08-03 16:57:44 -07:00
Joffrey F
20b29d048e
Merge pull request #1151 from docker/test_fixes_1.12
...
Test fixes and updated Makefile for 1.12 testing
2016-08-03 16:57:21 -07:00
Joffrey F
9d48b4f603
Test fixes and updated Makefile for 1.12 testing
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-03 16:48:41 -07:00
Daniel Nephin
67098f38df
Merge pull request #1150 from docker/1148-update-headers-fix
...
Avoid crashing in update_headers decorator when headers kwarg is None
2016-08-02 22:05:27 -04:00
Joffrey F
ae7cb4b99f
Avoid crashing in update_headers decorator when headers kwarg is None
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-02 17:25:50 -07:00
Joffrey F
650cc70e93
Merge pull request #1145 from jtakkala/1144-sysctl-support
...
Add support for sysctl when creating container
2016-08-01 17:32:18 -07:00
Jari Takkala
dec29e1c10
Add support for sysctl when creating container
...
Closes #1144
Signed-off-by: Jari Takkala <jtakkala@gmail.com>
2016-08-01 23:43:52 +01:00
Joffrey F
f99dc45d82
Merge pull request #1146 from aanand/config-path-debug
...
More explicit debug for config path logic
2016-08-01 10:59:32 -07:00
Tristan Escalada
f8b843b127
1059-Fixing a bug with multiple json objects
...
This splits the text by CRLF and then json.loads each part
independently instead of attempting the parse the whole string.
Signed-off-by: Tristan Escalada <tristan@escalada.us>
2016-08-01 11:05:32 -04:00
Aanand Prasad
f006da6a43
More explicit debug for config path logic
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-08-01 14:52:39 +01:00
Joffrey F
8a6b1843c3
Merge pull request #1143 from docker/1135-ipv6-docker-host
...
Add support for IPv6 docker host connections.
2016-07-28 12:51:44 -07:00
Joffrey F
723d144db5
Add support for IPv6 docker host connections.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-27 18:42:14 -07:00
Joffrey F
2d3bda84de
dev version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-26 15:48:29 -07:00
Joffrey F
a4a27d80f0
Merge branch 'release'
2016-07-26 15:46:51 -07:00
Joffrey F
e7198ad94e
Merge pull request #1137 from aanand/default-to-npipe-on-windows
...
Default to npipe address on Windows
2016-07-26 15:45:09 -07:00
Joffrey F
dc164c71be
Merge pull request #1140 from docker/1.9.0-release
...
Bump to 1.9.0
2016-07-26 12:21:12 -07:00
Joffrey F
5b1e556474
Bump to 1.9.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-26 12:11:32 -07:00
Ben Firshman
ae86949188
Set custom user agent on client
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-26 11:57:21 -07:00
Aanand Prasad
0e68b0a429
Default to npipe address on Windows
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-26 11:39:09 +01:00
Aanand Prasad
106c08faba
Merge pull request #1139 from docker/compose-3757-linklocal-fix
...
Send LinkLocalIPs as part of IPAMConfig dictionary
2016-07-26 11:07:48 +01:00
Joffrey F
cea7376086
Send LinkLocalIPs as part of IPAMConfig dictionary
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-25 15:04:04 -07:00
Aanand Prasad
30644d8ae0
Merge pull request #1133 from kmala/master
...
Add optional auth config to docker push
2016-07-22 19:43:42 +01:00
Keerthan Reddy Mala
1294d3c410
Add unit tests
...
Signed-off-by: Keerthan Reddy Mala <kmala@deis.com>
2016-07-22 10:04:32 -06:00
Keerthan Reddy Mala
9b63bed6a0
Add optional auth config to docker push
...
Signed-off-by: Keerthan Reddy Mala <kmala@deis.com>
2016-07-22 10:04:31 -06:00
Aanand Prasad
01cb969215
Merge pull request #1125 from bfirsh/user-agent
...
Set custom user agent on client
2016-07-22 14:55:19 +01:00
Ben Firshman
bd73225e14
Set custom user agent on client
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-20 15:04:54 -07:00
Aanand Prasad
e15ba7400a
Merge pull request #1130 from aanand/support-tcp-upgrade
...
Support for TCP upgrade
2016-07-18 17:03:20 +01:00
Aanand Prasad
267021e453
Rename read methods for clarity
...
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>
2016-07-13 18:58:57 -04:00
Aanand Prasad
69832627f8
Rename read_iter() to frames_iter()
...
This makes it more clearly high-level and distinct from the raw
data-reading functions
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:41:59 -04:00
Aanand Prasad
9fb2caecb9
Rename next_packet_size to next_frame_size
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
Aanand Prasad
456bfa1c1d
Reorder socket.py methods
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
Aanand Prasad
472a7ffce8
Remove unused imports
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
Aanand Prasad
ce2b60ecf6
Document all socket utility methods
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
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