toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,502 Commits 3 Branches 295 Tags
4fd87232eb39eedac790e7e8620901c9f43bec33
Commit Graph

7 Commits

Author SHA1 Message Date
Tonis Tiigi
bda6fa8f54 Add support for external CAs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
 2016-06-30 17:22:47 -07:00
Jana Radhakrishnan
467352d977 Vendoring swarmkit @3f135f206179e 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
 2016-06-17 19:01:18 -07:00
Jana Radhakrishnan
def8da9f42 Check if DriverState is valid before using in convert 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 4fea81154b817b09e553308a1595bfd97a8c0582
Component: engine
 2016-06-17 09:17:03 -07:00
Victor Vieux
b58041b07a use same hash for same secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a579ce8ed307024ededd527819bfdbf38e970fbf
Component: engine
 2016-06-15 17:20:18 -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
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
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