diff --git a/.gitignore b/.gitignore index b11a8a5..ff719bf 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ docker-volume-netshare.iml tests/ build/ .goxc.local.json +Dockerfile.release diff --git a/.travis.yml b/.travis.yml index 0d16e0f..d8648f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,6 @@ script: - go build install: - go get github.com/stretchr/testify -# - go get -v ./... + - go get -v ./... env: - GO15VENDOREXPERIMENT=1 diff --git a/Dockerfile b/Dockerfile index 0d8ed7c..ee61077 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ -FROM golang:1.5 +FROM golang:1.6 ## dkv-netshare is BASE image used by CIFS, NFS tafs ## -COPY . /go/src/app -WORKDIR /go/src/app -RUN go-wrapper download && go-wrapper install && go build -o docker-volume-netshare && cp docker-volume-netshare /bin +RUN mkdir -p /go/src/github.com/ContainX/docker-volume-netshare +COPY . /go/src/github.com/ContainX/docker-volume-netshare +WORKDIR /go/src/github.com/ContainX/docker-volume-netshare +#RUN go-wrapper download && go-wrapper install && go build -o docker-volume-netshare && cp docker-volume-netshare /bin diff --git a/Makefile b/Makefile index e22e32c..5b0f270 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.32 +VERSION = 0.33 GO_FMT = gofmt -s -w -l . GO_XC = goxc -os="linux" -bc="linux,amd64,arm" -tasks-="rmbin" diff --git a/netshare/drivers/efs.go b/netshare/drivers/efs.go index b7b805c..6536d41 100644 --- a/netshare/drivers/efs.go +++ b/netshare/drivers/efs.go @@ -2,12 +2,11 @@ package drivers import ( "fmt" + log "github.com/Sirupsen/logrus" + "github.com/docker/go-plugins-helpers/volume" "os" "regexp" "strings" - - log "github.com/Sirupsen/logrus" - "github.com/docker/go-plugins-helpers/volume" ) const ( diff --git a/netshare/netshare.go b/netshare/netshare.go index e84529c..647c3b8 100644 --- a/netshare/netshare.go +++ b/netshare/netshare.go @@ -230,7 +230,7 @@ func start(dt drivers.DriverType, driver volume.Driver) { } fmt.Println(h.ServeTCP(dt.String(), addr, nil)) } else { - fmt.Println(h.ServeUnix("", dt.String())) + fmt.Println(h.ServeUnix("", int(dt))) } } diff --git a/vendor/github.com/Sirupsen/logrus b/vendor/github.com/Sirupsen/logrus deleted file mode 160000 index 3ec0642..0000000 --- a/vendor/github.com/Sirupsen/logrus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3ec0642a7fb6488f65b06f9040adc67e3990296a diff --git a/vendor/github.com/dickeyxxx/netrc b/vendor/github.com/dickeyxxx/netrc deleted file mode 160000 index 3acf1b3..0000000 --- a/vendor/github.com/dickeyxxx/netrc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3acf1b3de25d89c7688c63bb45f6b07f566555ec diff --git a/vendor/github.com/docker/go-connections b/vendor/github.com/docker/go-connections deleted file mode 160000 index 988efe9..0000000 --- a/vendor/github.com/docker/go-connections +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 988efe982fdecb46f01d53465878ff1f2ff411ce diff --git a/vendor/github.com/docker/go-plugins-helpers b/vendor/github.com/docker/go-plugins-helpers deleted file mode 160000 index 8a0198e..0000000 --- a/vendor/github.com/docker/go-plugins-helpers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8a0198e77ac4e4ee167222caf6894cb32386c5fc diff --git a/vendor/github.com/miekg/dns b/vendor/github.com/miekg/dns deleted file mode 160000 index 58f52c5..0000000 --- a/vendor/github.com/miekg/dns +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58f52c57ce9df13460ac68200cef30a008b9c468 diff --git a/vendor/github.com/spf13/cobra b/vendor/github.com/spf13/cobra deleted file mode 160000 index 856b96d..0000000 --- a/vendor/github.com/spf13/cobra +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 856b96dcb49d6427babe192998a35190a12c2230 diff --git a/vendor/github.com/spf13/pflag b/vendor/github.com/spf13/pflag deleted file mode 160000 index dabebe2..0000000 --- a/vendor/github.com/spf13/pflag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dabebe21bf790f782ea4c7bbd2efc430de182afd diff --git a/vendor/golang.org/x/net b/vendor/golang.org/x/net deleted file mode 160000 index c33d378..0000000 --- a/vendor/golang.org/x/net +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c33d37840d93fc75251f49ab83c5fc8b2faea5e8