Merge pull request #29 from vieux/support_all_o

passthrough any -o

Author: vieux

.travis/integration.sh

@@ -8,11 +8,31 @@ docker pull rastasheep/ubuntu-sshd:14.04
 docker pull busybox
 
 #script
+
+# make the plugin
 make
+# enable the plugin
 make enable
+# list plugins
 docker plugin ls
+# start sshd
 docker run -d -p 2222:22 rastasheep/ubuntu-sshd:14.04
+
+# test1: simple
 docker volume create -d vieux/sshfs:next -o sshcmd=root@localhost:/ -o port=2222 -o password=root sshvolume
-docker volume ls
-docker run -it -v sshvolume:/data1 busybox sh -c "echo hello > /data1/world"
-docker run -it -v sshvolume:/data2 busybox grep -Fxq hello /data2/world
+docker run --rm -v sshvolume:/write busybox sh -c "echo hello > /write/world"
+docker run --rm -v sshvolume:/read busybox grep -Fxq hello /read/world
+docker volume rm sshvolume
+
+# test2: allow_other
+docker volume create -d vieux/sshfs:next -o sshcmd=root@localhost:/ -o allow_other -o port=2222 -o password=root sshvolume
+docker run --rm -v sshvolume:/write -u nobody busybox sh -c "echo hello > /write/world"
+docker run --rm -v sshvolume:/read -u nobody busybox grep -Fxq hello /read/world
+docker volume rm sshvolume
+
+# test3: compression
+docker volume create -d vieux/sshfs:next -o sshcmd=root@localhost:/ -o Ciphers=arcfour -o Compression=no -o port=2222 -o password=root sshvolume
+docker run --rm -v sshvolume:/write busybox sh -c "echo hello > /write/world"
+docker run --rm -v sshvolume:/read busybox grep -Fxq hello /read/world
+docker volume rm sshvolume
+

README.md

@@ -16,7 +16,7 @@ $ docker plugin install vieux/sshfs # or docker plugin install vieux/sshfs DEBUG
 2 - Create a volume
 
 ```
-$ docker volume create -d vieux/sshfs -o sshcmd=<user@host:path> -o password=<password> [-o port=<port>] [-o allow_other] sshvolume
+$ docker volume create -d vieux/sshfs -o sshcmd=<user@host:path> -o password=<password> [-o port=<port>] [-o <any_sshfs_-o_option> ] sshvolume
 sshvolume
 $ docker volume ls
 DRIVER              VOLUME NAME

main.go

@@ -20,10 +20,11 @@ import (
 const socketAddress = "/run/docker/plugins/sshfs.sock"
 
 type sshfsVolume struct {
-	Password   string
-	Sshcmd     string
-	Port       string
-	AllowOther bool
+	Password string
+	Sshcmd   string
+	Port     string
+
+	Options []string
 
 	Mountpoint  string
 	connections int
@@ -89,10 +90,12 @@ func (d *sshfsDriver) Create(r *volume.CreateRequest) error {
 			v.Password = val
 		case "port":
 			v.Port = val
-		case "allow_other":
-			v.AllowOther = true
 		default:
-			return logError("unknown option %q=%q", key, val)
+			if val != "" {
+				v.Options = append(v.Options, key+"="+val)
+			} else {
+				v.Options = append(v.Options, key)
+			}
 		}
 	}
 
@@ -243,9 +246,11 @@ func (d *sshfsDriver) mountVolume(v *sshfsVolume) error {
 		cmd.Args = append(cmd.Args, "-o", "workaround=rename", "-o", "password_stdin")
 		cmd.Stdin = strings.NewReader(v.Password)
 	}
-	if v.AllowOther {
-		cmd.Args = append(cmd.Args, "-o", "allow_other")
+
+	for _, option := range v.Options {
+		cmd.Args = append(cmd.Args, "-o", option)
 	}
+
 	logrus.Debug(cmd.Args)
 	return cmd.Run()
 }