Tonis Tiigi
f9f7abfffe
Add support for external CAs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit 11085b2260
2016-07-01 00:40:37 -07:00
Tonis Tiigi
4905c858db
Update to new swarmkit/engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit 9b65273836
2016-07-01 00:40:37 -07:00
Nishant Totla
ae47b00c6c
Adding a flag to specify sending of registry auth
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
(cherry picked from commit 538bac39d7
2016-07-01 00:40:31 -07:00
Nishant Totla
d199f78d18
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
(cherry picked from commit af5df117a8
2016-07-01 00:39:51 -07:00
Nishant Totla
c5ddd5bb7f
Passing registry auth token for service create and update
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
(cherry picked from commit 93ec5cda55
2016-07-01 00:39:51 -07:00
Madhu Venugopal
3657275ca0
Added missing flags for swarm-mode networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
(cherry picked from commit cf78863e9d
2016-06-30 16:57:32 -07:00
Tonis Tiigi
1f4e2f33ef
Fix race on clearing swarm nodes on stop
...
On stop there were multiple places that marked
`cluster.node` nil. Now stop waits for the node to
set itself nil.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit 1a8a473017
2016-06-30 16:57:31 -07:00
allencloud
f463560ead
fix error message and typos in swarm cluster
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
(cherry picked from commit 39bc10c36d
2016-06-30 16:47:49 -07:00
Aaron Lehmann
72bb109a68
Remove log warning on task update
...
This warning appears in the course of normal use of swarm mode. Since
it's meant more as an internal TODO than something which should be
exposed to a user, remove the log message.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
(cherry picked from commit 39c93cfb47
2016-06-30 16:47:48 -07:00
Tonis Tiigi
1fdce39622
Add better error messages for unavailable swarm commands
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit 803733120a
2016-06-30 16:47:48 -07:00
Tonis Tiigi
e546ffb37a
Fix error reporting on executor wait
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit c895a76f10
2016-06-30 16:47:47 -07:00
Tonis Tiigi
3d06cd4910
Unify swarm init and update options
...
Add api side validation and defaults for init and
join requests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit fb3eb1c27e
2016-06-30 16:47:44 -07:00
bin liu
6a5a150722
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com >
(cherry picked from commit 950073aabb
2016-06-30 16:47:43 -07:00
nick
62d50a3f13
Fix misspell typos
...
Signed-off-by: nick <nicholasrusso@icloud.com >
(cherry picked from commit 7135afa79b
2016-06-30 16:47:43 -07:00
Tonis Tiigi
8a994d4724
Don’t try to restore swarm from incomplete state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit ded1d9af38
2016-06-30 16:47:37 -07:00
Jana Radhakrishnan
0728f28cbe
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
(cherry picked from commit 64a567d24c
2016-06-18 20:58:24 -07:00
tomwbarlow@gmail.com
9e1d592de3
Change log.printf service creation msg to debug
...
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com >
(cherry picked from commit eed8d14ed1
2016-06-18 20:58:24 -07:00
Jana Radhakrishnan
8fdc925338
Check if DriverState is valid before using in convert
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
(cherry picked from commit 4fea81154b
2016-06-17 13:09:12 -07:00
Tonis Tiigi
efc10a92ef
Fix removing containers on leaving from pending state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit 826f6f0703
2016-06-16 23:36:58 -07:00
Tonis Tiigi
0cac3c4c23
Return membership status on join without timeout
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit 1973cee0cd
2016-06-16 23:36:57 -07:00
Tonis Tiigi
01c5b208e8
Update daemon to new swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit a83bba467a
2016-06-16 23:36:57 -07:00
Victor Vieux
7f4bca0f90
use same hash for same secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
(cherry picked from commit a579ce8ed3
2016-06-16 23:36:55 -07:00
Victor Vieux
7cc76facba
fix docker swarm init/update --secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
(cherry picked from commit 085895342c
2016-06-16 23:36:54 -07:00
Madhu Venugopal
60a86590aa
Use service alias and configure container's --net-alias
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
(cherry picked from commit 07e39e9e72
2016-06-16 23:36:51 -07:00
Arnaud Porterie
bd92dd29b9
Merge pull request #23531 from tonistiigi/rm-race
...
Fix race on force deleting container created by task
2016-06-15 02:33:56 +00:00
Arnaud Porterie
91197953d0
Merge pull request #23524 from aboch/restore
...
Daemon to support network restore
2016-06-15 02:33:16 +00:00
Tonis Tiigi
25a89d73e5
Update daemon to new swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-06-14 17:23:35 -07:00
Tonis Tiigi
dcfe99278d
Fix race on force deleting container created by task
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-06-14 16:49:04 -07:00
Lei Jitang
ecffb6d58c
Daemon to support network restore
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-06-14 16:45:25 -07:00
Brian Goff
87f31e379d
Merge pull request #23523 from vieux/fix_mounts_swarm
...
fix 2 potential panics with mounts in swarm
2016-06-14 14:44:19 -04:00
Tonis Tiigi
499e3a45b1
Increase the join connect timeout
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-06-14 10:20:47 -07:00
Victor Vieux
ffeb9fcb2a
fix 2 potential panics with mounts in swarm
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-06-14 09:25:39 -07:00
Tonis Tiigi
534a90a993
Add Swarm management backend
...
As described in our ROADMAP.md, introduce new Swarm management API
endpoints relying on swarmkit to deploy services. It currently vendors
docker/engine-api changes.
This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-06-13 22:16:18 -07:00
