Skip to content

Commit

Permalink
version 0.33, EFS fix, remove vendor
Browse files Browse the repository at this point in the history
  • Loading branch information
gondor committed Jan 9, 2017
1 parent 3b84951 commit e60a752
Show file tree
Hide file tree
Showing 14 changed files with 11 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ docker-volume-netshare.iml
tests/
build/
.goxc.local.json
Dockerfile.release
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ script:
- go build
install:
- go get github.com/stretchr/testify
# - go get -v ./...
- go get -v ./...
env:
- GO15VENDOREXPERIMENT=1
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
5 changes: 2 additions & 3 deletions netshare/drivers/efs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion netshare/netshare.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
}
}

Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/Sirupsen/logrus
Submodule logrus deleted from 3ec064
1 change: 0 additions & 1 deletion vendor/github.com/dickeyxxx/netrc
Submodule netrc deleted from 3acf1b
1 change: 0 additions & 1 deletion vendor/github.com/docker/go-connections
Submodule go-connections deleted from 988efe
1 change: 0 additions & 1 deletion vendor/github.com/docker/go-plugins-helpers
Submodule go-plugins-helpers deleted from 8a0198
1 change: 0 additions & 1 deletion vendor/github.com/miekg/dns
Submodule dns deleted from 58f52c
1 change: 0 additions & 1 deletion vendor/github.com/spf13/cobra
Submodule cobra deleted from 856b96
1 change: 0 additions & 1 deletion vendor/github.com/spf13/pflag
Submodule pflag deleted from dabebe
1 change: 0 additions & 1 deletion vendor/golang.org/x/net
Submodule net deleted from c33d37

0 comments on commit e60a752

Please sign in to comment.