Merge pull request #27998 from dnephin/compose-on-swarm

Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
This commit is contained in:
Victor Vieux
2016-11-10 17:59:57 -08:00
committed by GitHub
55 changed files with 16726 additions and 169 deletions
@@ -141,8 +141,8 @@ func (c *containerConfig) config() *enginecontainer.Config {
Labels: c.labels(),
Tty: c.spec().TTY,
User: c.spec().User,
Hostname: c.spec().Hostname,
Env: c.spec().Env,
Hostname: c.spec().Hostname,
WorkingDir: c.spec().Dir,
Image: c.image(),
Volumes: c.volumes(),