Alexander Morozov
ebc51d1954
Merge pull request #356 from tamird/server-resp-not-pointer
...
client: pass `serverResponse` around by value
2016-08-15 12:54:26 -07:00
Alexander Morozov
db49fd5efa
Merge pull request #366 from cpuguy83/more_error_handling_fixes
...
Fixes more issues swallowing connection errors
2016-08-15 11:36:46 -07:00
Brian Goff
809c1bdc54
Fixes more issues swallowing connection errors
...
Really need to make sure we are only returning `ErrConnectionFailed`
when it's really a failed connection, not just something that reports as
a non-temporary error.
This fixes more tests on docker CI.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-15 12:47:42 -04:00
Vincent Demeester
3ae7fcd11e
Merge pull request #364 from stevvooe/add-tty-and-groups
...
swarm/container: add support for TTY and supplementary groups
2016-08-14 19:14:43 +02:00
Vincent Demeester
fdb5acc8f4
Merge pull request #363 from cpuguy83/add_build_squash
...
Add options for build squashing
2016-08-14 19:12:22 +02:00
Stephen J Day
2a1311921a
swarm/container: add support for TTY and supplementary groups
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-08-12 12:51:03 -07:00
Alexander Morozov
a55b27b2dc
Merge pull request #362 from cpuguy83/fix_connect_errors
...
Correct order of error checking on connect failure
2016-08-12 12:38:37 -07:00
Brian Goff
4f34d8e18a
Add options for build squashing
...
Related to docker/docker#22641
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-12 15:36:30 -04:00
Brian Goff
bd4776a59a
Correct order of error checking on connect failure
...
1730fe8fb0
changed error checking to use
the `Temporary()` function from `net.Error`. Unfortunately having this
check so high up it is catching more than we really want it to and
causing the custom error checks below it to not be caught.
This moves the net.Error check to last since it is the most generic
check.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-12 14:05:30 -04:00
Brian Goff
1de6a79199
Merge pull request #360 from thaJeztah/remove-size-query-param
...
Remove unused "size" query parameter
2016-08-11 18:39:36 -04:00
Sebastiaan van Stijn
1e9b026e8c
Remove unused "size" query parameter
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-11 23:27:49 +02:00
Alexander Morozov
faa11eca6a
Merge pull request #309 from hqhq/remove_execdriver
...
Remove execution driver
2016-08-11 11:53:11 -07:00
Alexander Morozov
a47f92828a
Merge pull request #359 from cpuguy83/fix_volume_nocopy
...
Fix wrong field name on mount: s/Populate/NoCopy
2016-08-11 11:36:43 -07:00
Brian Goff
90377596ef
Fix wrong field name on mount: s/Populate/NoCopy
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-11 14:32:12 -04:00
Brian Goff
b54bc2593f
Merge pull request #258 from cpuguy83/better_mounts_api
...
Add new APIs for safer mount specifications
2016-08-11 12:27:23 -04:00
Vincent Demeester
3342859391
Merge pull request #357 from LK4D4/race_free_cancellable
...
cancellable: use sync.Once to prevent double channel close
2016-08-11 09:50:11 +02:00
Alexander Morozov
d8ae3d962c
cancellable: use sync.Once to prevent double channel close
...
Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
2016-08-10 10:47:56 -07:00
Vincent Demeester
fc564829f6
Merge pull request #349 from tamird/docker-cannot-connect-context
...
client: only return ErrConnectionFailed on fatal network errors
2016-08-09 20:19:22 +02:00
Vincent Demeester
2f203293b3
Merge pull request #355 from tamird/dont-decorate-context-errors
...
request: don't decorate context errors
2016-08-09 20:18:40 +02:00
Tamir Duberstein
6922bf580b
client: pass `serverResponse` around by value
...
Removes a bunch of impossible and useless nil checks.
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
2016-08-09 13:21:54 -04:00
Tamir Duberstein
4d0d10bed9
request: don't decorate context errors
...
Comparing directly to sentinels is handy when implementing retries.
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
2016-08-09 11:12:26 -04:00
Tamir Duberstein
1730fe8fb0
client: only return ErrConnectionFailed on fatal network errors
...
Fixes #347 .
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
2016-08-09 10:55:57 -04:00
Brian Goff
d8662f7f77
Merge pull request #321 from yongtang/23367-out-of-band-volume-driver-deletion
...
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
2016-08-09 10:39:50 -04:00
Vincent Demeester
eb03440e93
Merge pull request #354 from allencloud/add-string-func-for-NetIPNet
...
add fun String() for NetIPNet
2016-08-09 16:30:54 +02:00
allencloud
31a6e50881
add fun String() for NetIPNet
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-09 15:22:14 +08:00
Brian Goff
61712aa11e
Use new mounts API in hostconfig
...
Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.local>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-08 19:07:36 -04:00
Vincent Demeester
16c66e864c
Merge pull request #348 from Hui-Zhi/correct-grammer-mistake
...
correct grammar mistake
2016-08-03 16:39:42 +02:00
Hui-Zhi
8b04da8099
Add singed off, Signed-off-by: Hui-Zhi <zhaohuizhi@gmail.com>
...
Signed-off-by: Hui-Zhi <zhaohuizhi@gmail.com>
2016-08-03 02:12:19 -04:00
Sebastiaan van Stijn
603ec41824
Merge pull request #346 from stevvooe/clarify-user-support
...
container: Config.User field supports "user:group" syntax
2016-08-02 23:24:09 +02:00
Stephen J Day
69cceed4ae
container: Config.User field supports "user:group" syntax
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-08-02 14:05:48 -07:00
Sebastiaan van Stijn
3a9562061f
Merge pull request #336 from vieux/plugin_rm_force
...
add 'force' parameter to docker plugin rm to remove an active plugin
2016-08-02 17:08:26 +02:00
Sebastiaan van Stijn
228c7390a7
Merge pull request #320 from xetorthio/darwin_default
...
Make darwin default docker host the same as unix
2016-07-31 16:45:07 +01:00
Vincent Demeester
4eca04ae18
Merge pull request #341 from diogomonica/adding-force-to-node-remove
...
Adding force to the RemoveNode API
2016-07-29 07:34:18 +02:00
Diogo Monica
61cb872d9d
Adding force to the RemoveNode API
...
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
2016-07-28 15:28:07 -07:00
Victor Vieux
3d1601b9d2
Merge pull request #340 from aaronlehmann/remove-join-tokens-from-info
...
Carry #339 : Remove join-tokens from info
2016-07-27 11:58:13 -07:00
Aaron Lehmann
052c50f63b
Remove join-tokens from info
...
join-tokens are not needed for the endpoint
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-27 11:50:57 -07:00
Vincent Demeester
dccf10e58a
Merge pull request #338 from mlaventure/godoc-liverestore
...
Rename the info LiveRestore field to LiveRestoreEnabled and document it
2016-07-27 12:02:21 +02:00
Kenfe-Mickael Laventure
719a0f942d
Rename the info LiveRestore to LiveRestoreEnabled and document it
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-26 16:50:25 -07:00
Tibor Vass
a52656d77f
Merge pull request #334 from vdemeester/add-swarm-swarm-to-info
...
Add swarm.Swarm to swarm.Info…
2016-07-25 20:19:27 -07:00
Vincent Demeester
3c6d71a7e8
Merge pull request #335 from mlaventure/add-live-restore-to-info
...
Add LiveRestore field to Info struct
2016-07-25 20:42:58 +02:00
Kenfe-Mickael Laventure
a18e2bede7
Add LiveRestore field to Info struct
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-25 10:06:28 -07:00
Vincent Demeester
1ddbc48560
Add swarm.Swarm to swarm.Info…
...
… in order to display Swarm information in the `/info` endpoint.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-23 19:29:45 +02:00
Michael Crosby
53b6b19ee6
Merge pull request #333 from aaronlehmann/rolling-updates
...
Add failure action for rolling updates
2016-07-22 17:52:42 -07:00
Aaron Lehmann
14c70cc34b
Add failure action for rolling updates
...
This is the engine-api portion of docker/docker#24943 .
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-22 16:30:58 -07:00
Sebastiaan van Stijn
ebb728a134
Merge pull request #332 from tiborvass/healthchecks-exit-code-2
...
healthchecks: update comment about exit code 2
2016-07-23 00:59:33 +02:00
Tibor Vass
033f6a83ae
healthchecks: update comment about exit code 2
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2016-07-22 15:55:27 -07:00
Tibor Vass
f40c9c2b04
Merge pull request #331 from thaJeztah/rename-rotate_xx_token
...
Rename rotate_manager_token to rotateManagerToken
2016-07-22 14:38:27 -07:00
Sebastiaan van Stijn
3d90f9ed92
Rename rotate_manager_token to rotateManagerToken
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-22 22:10:38 +02:00
Sebastiaan van Stijn
1f04697443
Merge pull request #328 from anusha-ragunathan/plugin-event-type
...
Required api changes for https://github.com/docker/docker/pull/24760
2016-07-22 20:58:35 +02:00
Victor Vieux
bbd480dd54
add 'force' parameter to docker plugin rm to remove an active plugin
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-07-22 07:08:23 -07:00