toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,450 Commits 3 Branches 295 Tags
9da2bc7d4c97a3c026d8aed62843600a3742f702
Commit Graph
21 Commits
Author SHA1 Message Date
Tõnis Tiigi e32550579c Merge pull request #23584 from nishanttotla/private-images-swarm-services 
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
 2016-06-30 17:18:59 -07:00
Nishant Totla 9f0a770513 Adding a flag to specify sending of registry auth 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 538bac39d7fe93562922b89e9a294096be48fb59
Component: engine
 2016-06-30 14:59:32 -07:00
Alexander Morozov 29d2889a79 Merge pull request #23789 from tonistiigi/swarm-integration-tests 
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
 2016-06-29 14:09:57 -07:00
Nishant Totla b75c9d3100 Passing registry auth token for service create and update 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 93ec5cda55e78dbb683b59bde244a7984b323574
Component: engine
 2016-06-28 13:53:01 -07:00
Tonis Tiigi 5c10897dd4 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>
Upstream-commit: 1a8a473017299c5e999d55d14634874826062fce
Component: engine
 2016-06-24 13:57:02 -07:00
Brian Goff da85d118fb Merge pull request #23940 from allencloud/fix-err-msg 
fix error message and typos in swarm cluster
Upstream-commit: 7ff546467de3fa3d1c1104e9f40c6d16742ebac0
Component: engine
 2016-06-24 16:57:01 -04:00
allencloud f3ebf274bf fix error message and typos in swarm cluster 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 39bc10c36d40677c11a800b4346c5cddec2b997d
Component: engine
 2016-06-25 03:10:18 +08:00
Tonis Tiigi 009e2dd2e1 Add better error messages for unavailable swarm commands 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 803733120a1f9f080c6403f2a3717987393f1f0d
Component: engine
 2016-06-24 10:14:57 -07:00
Tonis Tiigi 8c9dd4362c 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>
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
 2016-06-21 16:34:32 -07:00
Tonis Tiigi 20fc079713 Don’t try to restore swarm from incomplete state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ded1d9af38cb467dadab0521936174eef0d4bc9e
Component: engine
 2016-06-18 19:43:47 -07:00
Arnaud Porterie 79ea0079e7 Merge pull request #23644 from tonistiigi/fix-leave-delete 
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
 2016-06-17 01:40:45 +00:00
Tonis Tiigi dae11af952 Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
 2016-06-16 16:08:15 -07:00
Tonis Tiigi 10f6f936be Return membership status on join without timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1973cee0cd86da3c7b7002a3fed7af2557df538c
Component: engine
 2016-06-16 15:27:08 -07:00
Tonis Tiigi e79dde3c67 Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a83bba467a8bd24924b1a0cf55b954ac49937b5b
Component: engine
 2016-06-16 15:06:27 -07:00
Victor Vieux 9bd6973edb fix docker swarm init/update --secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
 2016-06-15 17:05:10 -07:00
Madhu Venugopal e306e601d2 Use service alias and configure container's --net-alias 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 07e39e9e7283a159efa18bc8f72cb2dc0e4f700f
Component: engine
 2016-06-14 19:50:34 -07:00
Arnaud Porterie 955da7c9c3 Merge pull request #23524 from aboch/restore 
Daemon to support network restore
Upstream-commit: 91197953d07843e34f02d6d2dc435cc4c43dfec1
Component: engine
 2016-06-15 02:33:16 +00:00
Tonis Tiigi a7a6c7f5a8 Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 25a89d73e57e46dd23caebcb6446c7edd6e07f56
Component: engine
 2016-06-14 17:23:35 -07:00
Lei Jitang a05c8dd297 Daemon to support network restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: ecffb6d58cf89371e3f4a20f55c2e614dbdfe880
Component: engine
 2016-06-14 16:45:25 -07:00
Tonis Tiigi fd56910b10 Increase the join connect timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 499e3a45b17eff6d52abe6ba9063fe365415cf08
Component: engine
 2016-06-14 10:20:47 -07:00
Tonis Tiigi be63983b3a 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>
Upstream-commit: 534a90a99367af6f6bba1ddcc7eb07506e41f774
Component: engine
 2016-06-13 22:16:18 -07:00