kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Set bind driver after volume is created

Browse source 
When using a named volume without --volume-driver, the driver was
hardcoded to "local".
Even when the volume was already created by some other driver (and
visible in `docker volume ls`), the container would store in it's own
config that it was the `local` driver.
The external driver would work perfecly fine until the daemon is
restarted, at which point the `local` driver was assumed because that is
as it was set in the container config.

Set the bind driver to the driver returned by createVolume.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2015-09-01 20:13:38 -04:00
parent fb4cce5e53
commit 39be36658d
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/create_unix.go
View file

@ -64,7 +64,7 @@ func createContainerPlatformSpecificSettings(container *Container, config *runco
}
// never attempt to copy existing content in a container FS to a shared volume
if volumeDriver == volume.DefaultDriverName || volumeDriver == "" {
if v.DriverName() == volume.DefaultDriverName {
if err := container.copyImagePathContent(v, destination); err != nil {
return err
}

2
daemon/volumes_unix.go
View file

@ -342,6 +342,8 @@ func (daemon *Daemon) registerMountPoints(container *Container, hostConfig *runc
}
bind.Volume = v
bind.Source = v.Path()
// bind.Name is an already existing volume, we need to use that here
bind.Driver = v.DriverName()
// Since this is just a named volume and not a typical bind, set to shared mode `z`
if bind.Mode == "" {
bind.Mode = "z"

16
integration-cli/docker_cli_start_volume_driver_unix_test.go
View file

@ -350,3 +350,19 @@ func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverRetryNotImmedia
c.Assert(s.ec.mounts, check.Equals, 1)
c.Assert(s.ec.unmounts, check.Equals, 1)
}
func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverBindExternalVolume(c *check.C) {
dockerCmd(c, "volume", "create", "-d", "test-external-volume-driver", "--name", "foo")
dockerCmd(c, "run", "-d", "--name", "testing", "-v", "foo:/bar", "busybox", "top")
var mounts []struct {
Name string
Driver string
}
out, err := inspectFieldJSON("testing", "Mounts")
c.Assert(err, check.IsNil)
c.Assert(json.NewDecoder(strings.NewReader(out)).Decode(&mounts), check.IsNil)
c.Assert(len(mounts), check.Equals, 1, check.Commentf(out))
c.Assert(mounts[0].Name, check.Equals, "foo")
c.Assert(mounts[0].Driver, check.Equals, "test-external-volume-driver")
}