Merge pull request #184 from vdemeester/60-fix-volumes_from

Fix the `volumes_from` behaviour

Author: vdemeester

docker/convert.go

@@ -1,6 +1,7 @@
 package docker
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/docker/docker/runconfig/opts"
@@ -122,6 +123,14 @@ func Convert(c *project.ServiceConfig, ctx project.Context) (*container.Config,
 		return nil, nil, err
 	}
 
+	var volumesFrom []string
+	if c.VolumesFrom != nil {
+		volumesFrom, err = getVolumesFrom(c.VolumesFrom, ctx.Project.Configs, ctx.ProjectName)
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
 	config := &container.Config{
 		Entrypoint:   strslice.StrSlice(utils.CopySlice(c.Entrypoint.Slice())),
 		Hostname:     c.Hostname,
@@ -162,7 +171,7 @@ func Convert(c *project.ServiceConfig, ctx project.Context) (*container.Config,
 	}
 
 	hostConfig := &container.HostConfig{
-		VolumesFrom: utils.CopySlice(c.VolumesFrom),
+		VolumesFrom: volumesFrom,
 		CapAdd:      strslice.StrSlice(utils.CopySlice(c.CapAdd)),
 		CapDrop:     strslice.StrSlice(utils.CopySlice(c.CapDrop)),
 		ExtraHosts:  utils.CopySlice(c.ExtraHosts),
@@ -189,6 +198,20 @@ func Convert(c *project.ServiceConfig, ctx project.Context) (*container.Config,
 	return config, hostConfig, nil
 }
 
+func getVolumesFrom(volumesFrom []string, services map[string]*project.ServiceConfig, projectName string) ([]string, error) {
+	volumes := []string{}
+	for _, volumeFrom := range volumesFrom {
+		if _, ok := services[volumeFrom]; ok {
+			// It's a service - Use the first one
+			name := fmt.Sprintf("%s_%s_1", projectName, volumeFrom)
+			volumes = append(volumes, name)
+		} else {
+			volumes = append(volumes, volumeFrom)
+		}
+	}
+	return volumes, nil
+}
+
 func parseDevices(devices []string) ([]container.DeviceMapping, error) {
 	// parse device mappings
 	deviceMappings := []container.DeviceMapping{}

integration/assets/regression/60-volume_from.yml

@@ -0,0 +1,9 @@
+first:
+  image: busybox
+  volumes:
+    - /bundle
+second:
+  image: busybox
+  volumes_from:
+    - first
+

integration/up_test.go

@@ -3,7 +3,6 @@ package integration
 import (
 	"fmt"
 	"os/exec"
-	"path/filepath"
 	"strings"
 
 	"golang.org/x/net/context"
@@ -299,24 +298,6 @@ func (s *RunSuite) TestLink(c *C) {
 	}))
 }
 
-func (s *RunSuite) TestRelativeVolume(c *C) {
-	p := s.ProjectFromText(c, "up", `
-	server:
-	  image: busybox
-	  volumes:
-	    - .:/path
-	`)
-
-	absPath, err := filepath.Abs(".")
-	c.Assert(err, IsNil)
-	serverName := fmt.Sprintf("%s_%s_1", p, "server")
-	cn := s.GetContainerByName(c, serverName)
-
-	c.Assert(cn, NotNil)
-	c.Assert(len(cn.Mounts), DeepEquals, 1)
-	c.Assert(cn.Mounts[0].Source, DeepEquals, absPath)
-}
-
 func (s *RunSuite) TestUpNoBuildFailIfImageNotPresent(c *C) {
 	p := s.RandomProject()
 	cmd := exec.Command(s.command, "-f", "./assets/build/docker-compose.yml", "-p", p, "up", "--no-build")

integration/volume_test.go

@@ -0,0 +1,43 @@
+package integration
+
+import (
+	"fmt"
+	"os/exec"
+	"path/filepath"
+
+	. "gopkg.in/check.v1"
+)
+
+func (s *RunSuite) TestVolumeFromService(c *C) {
+	p := s.RandomProject()
+	cmd := exec.Command(s.command, "-f", "./assets/regression/60-volume_from.yml", "-p", p, "create")
+	err := cmd.Run()
+	c.Assert(err, IsNil)
+
+	volumeFromContainer := fmt.Sprintf("%s_%s_1", p, "first")
+	secondContainerName := p + "_second_1"
+
+	cn := s.GetContainerByName(c, secondContainerName)
+	c.Assert(cn, NotNil)
+
+	c.Assert(len(cn.HostConfig.VolumesFrom), Equals, 1)
+	c.Assert(cn.HostConfig.VolumesFrom[0], Equals, volumeFromContainer)
+}
+
+func (s *RunSuite) TestRelativeVolume(c *C) {
+	p := s.ProjectFromText(c, "up", `
+	server:
+	  image: busybox
+	  volumes:
+	    - .:/path
+	`)
+
+	absPath, err := filepath.Abs(".")
+	c.Assert(err, IsNil)
+	serverName := fmt.Sprintf("%s_%s_1", p, "server")
+	cn := s.GetContainerByName(c, serverName)
+
+	c.Assert(cn, NotNil)
+	c.Assert(len(cn.Mounts), DeepEquals, 1)
+	c.Assert(cn.Mounts[0].Source, DeepEquals, absPath)
+}