Support for Docker 1.10 - Issue #13

Author: gondor

.goxc.json

@@ -1,7 +1,7 @@
 {
  "ArtifactsDest": "build",
  "ConfigVersion": "0.9",
- "PackageVersion": "0.10",
+ "PackageVersion": "0.11",
  "TaskSettings": {
   "bintray": {
    "user": "gondor",

README.md

@@ -29,9 +29,9 @@ $ go build
 
 #### From Binaries
 
-* Architecture i386 [ [linux](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_linux_386.tar.gz?direct) / [netbsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_netbsd_386.zip?direct) / [freebsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_freebsd_386.zip?direct) / [openbsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_openbsd_386.zip?direct) ]
-* Architecture amd64 [ [linux](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_linux_amd64.tar.gz?direct) / [netbsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_netbsd_amd64.zip?direct) / [freebsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_freebsd_amd64.zip?direct) / [openbsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_openbsd_amd64.zip?direct) ]
-* Debian Package [ [i386](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_i386.deb?direct) ] / [amd64](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_amd64.deb?direct) ] ]
+* Architecture i386 [ [linux](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_linux_386.tar.gz?direct) / [netbsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_netbsd_386.zip?direct) / [freebsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_freebsd_386.zip?direct) / [openbsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_openbsd_386.zip?direct) ]
+* Architecture amd64 [ [linux](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_linux_amd64.tar.gz?direct) / [netbsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_netbsd_amd64.zip?direct) / [freebsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_freebsd_amd64.zip?direct) / [openbsd](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_openbsd_amd64.zip?direct) ]
+* Debian Package [ [i386](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_i386.deb?direct) ] / [amd64](https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_amd64.deb?direct) ] ]
 
 #### On Ubuntu / Debian
 
@@ -40,8 +40,8 @@ The method below will install the sysvinit and /etc/default options that can be
 1. Install the Package
 
 ```
-  $ wget https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.10_i386.deb
-  $ sudo dpkg -i docker-volume-netshare_0.10_i386.deb
+  $ wget https://dl.bintray.com//content/pacesys/docker/docker-volume-netshare_0.11_i386.deb
+  $ sudo dpkg -i docker-volume-netshare_0.11_i386.deb
 ```
 
 2. Modify the startup options in `/etc/default/docker-volume-netshare`

netshare/drivers/cifs.go

@@ -74,6 +74,16 @@ func (s cifsDriver) Path(r volume.Request) volume.Response {
 	return volume.Response{Mountpoint: mountpoint(s.root, r.Name)}
 }
 
+func (s cifsDriver) Get(r volume.Request) volume.Response {
+	log.Debugf("Get for %s is at %s", r.Name, mountpoint(s.root, r.Name))
+	return volume.Response{ Volume: &volume.Volume{Name: r.Name, Mountpoint: mountpoint(s.root, r.Name)}}
+}
+
+func (s cifsDriver) List(r volume.Request) volume.Response {
+	log.Debugf("List Volumes")
+	return volume.Response{ Volumes: s.mountm.GetVolumes(s.root) }
+}
+
 func (s cifsDriver) Mount(r volume.Request) volume.Response {
 	s.m.Lock()
 	defer s.m.Unlock()

netshare/drivers/efs.go

@@ -69,6 +69,16 @@ func (e efsDriver) Path(r volume.Request) volume.Response {
 	return volume.Response{Mountpoint: mountpoint(e.root, r.Name)}
 }
 
+func (s efsDriver) Get(r volume.Request) volume.Response {
+	log.Debugf("Get for %s is at %s", r.Name, mountpoint(s.root, r.Name))
+	return volume.Response{ Volume: &volume.Volume{Name: r.Name, Mountpoint: mountpoint(s.root, r.Name)}}
+}
+
+func (s efsDriver) List(r volume.Request) volume.Response {
+	log.Debugf("List Volumes")
+	return volume.Response{ Volumes: s.mountm.GetVolumes(s.root) }
+}
+
 func (e efsDriver) Mount(r volume.Request) volume.Response {
 	e.m.Lock()
 	defer e.m.Unlock()

netshare/drivers/mounts.go

@@ -1,4 +1,5 @@
 package drivers
+import "github.com/docker/go-plugins-helpers/volume"
 
 type mount struct {
 	name        string
@@ -86,3 +87,13 @@ func (m *mountManager) Decrement(dest string) int {
 	}
 	return 0
 }
+
+func (m *mountManager) GetVolumes(rootPath string) []*volume.Volume {
+
+	volumes := []*volume.Volume{}
+
+	for name, mount := range m.mounts {
+		volumes = append(volumes, &volume.Volume{Name: name, Mountpoint: mountpoint(rootPath, mount.name)})
+	}
+	return volumes
+}

netshare/drivers/nfs.go

@@ -46,6 +46,16 @@ func (n nfsDriver) Path(r volume.Request) volume.Response {
 	return volume.Response{Mountpoint: mountpoint(n.root, r.Name)}
 }
 
+func (s nfsDriver) Get(r volume.Request) volume.Response {
+	log.Debugf("Get for %s is at %s", r.Name, mountpoint(s.root, r.Name))
+	return volume.Response{ Volume: &volume.Volume{Name: r.Name, Mountpoint: mountpoint(s.root, r.Name)}}
+}
+
+func (s nfsDriver) List(r volume.Request) volume.Response {
+	log.Debugf("List Volumes")
+	return volume.Response{ Volumes: s.mountm.GetVolumes(s.root) }
+}
+
 func (n nfsDriver) Mount(r volume.Request) volume.Response {
 	n.m.Lock()
 	defer n.m.Unlock()