Merge pull request #20 from herveleclerc/master

Volumes and VolumesFrom feature

Author: mcuadros

core/docker.go

@@ -290,7 +290,8 @@ func (d *Docker) startContainer(p *Project, c *Container) error {
 		PortBindings:  ports,
 		RestartPolicy: restartPolicy,
 		Links:         d.formatLinks(p.Links),
-		VolumesFrom:   p.Volumes,
+		VolumesFrom:   p.VolumesFrom,
+		Binds:         p.Binds,
 	})
 }
 

core/project.go

@@ -29,7 +29,8 @@ type Project struct {
 	NoCache             bool
 	Restart             string
 	Ports               []string         `gcfg:"Port"`
-	Volumes             []string         `gcfg:"Volume"`
+	Binds               []string         `gcfg:"Volume"`
+	VolumesFrom         []string         `gcfg:"VolumeFrom"`
 	Links               map[string]*Link `json:"-"`
 	LinkNames           []LinkDefinition `gcfg:"Link"`
 	LinkedBy            []*Project       `json:"-"`

documentation/configuration.md

@@ -74,6 +74,7 @@ An environment is a logical group of any number of Docker servers. Dockership su
 * `Restart` (optional, default: no): restart policy to apply when a container exits (no, on-failure[:max-retry], always)  (like --restart at `docker run`)
 * `Link` (multiple, optional): creates a Link to other project, when this project is deployed the linked projects are restarted (like -P at `docker run`)
 * `Volume` (multiple, optional): mounts a Data Volume Container (like -v at `docker run`)
+* `VolumeFrom` (multiple, optional): mounts a Data Volumes From  a specified container (like --volumes-from at `docker run`)
 * `GithubToken` (default: Global.GithubToken): the token needed to access this repository, if it is different from the global one.
 * `Environment` (multiple, mandatory): Environment name where this project could be deployed
 * `WebHook` (optional): An HTTP address. See [Extending Dockership](https://github.com/mcuadros/dockership/blob/master/documentation/extending_dockership.md#web-hooks) for details.