docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,141 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

14 Commits

Author SHA1 Message Date
allencloud f463560ead fix error message and typos in swarm cluster 
Signed-off-by: allencloud <allen.sun@daocloud.io>

(cherry picked from commit 39bc10c36d40677c11a800b4346c5cddec2b997d)
 2016-06-30 16:47:49 -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 803733120a1f9f080c6403f2a3717987393f1f0d)
 2016-06-30 16:47:48 -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 fb3eb1c27ef5520571c599ead8a72b343748db39)
 2016-06-30 16:47:44 -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 ded1d9af38cb467dadab0521936174eef0d4bc9e)
 2016-06-30 16:47:37 -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 826f6f07031abc4dea6f71ed69d33a4e0789ee11)
 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 1973cee0cd86da3c7b7002a3fed7af2557df538c)
 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 a83bba467a8bd24924b1a0cf55b954ac49937b5b)
 2016-06-16 23:36:57 -07:00
Victor Vieux 7cc76facba fix docker swarm init/update --secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 085895342c7f797f0eef7ec956438e33489f211f)
 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 07e39e9e7283a159efa18bc8f72cb2dc0e4f700f)
 2016-06-16 23:36:51 -07: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
Lei Jitang ecffb6d58c Daemon to support network restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-06-14 16:45:25 -07: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
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