...

Gopkg.toml

@@ -1,33 +1,11 @@
 
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
-
 [[constraint]]
   branch = "master"
   name = "github.com/docker/go-plugins-helpers"
 
 [[constraint]]
+  branch = "master"
   name = "github.com/sirupsen/logrus"
-  version = "1.0.2"
 
 [[constraint]]
   branch = "master"
@@ -36,3 +14,12 @@
 [[constraint]]
   branch = "master"
   name = "github.com/spf13/viper"
+
+[[override]]
+  version = "1.0.0-rc4"
+  name = "github.com/opencontainers/runc"
+
+[[override]]
+  revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+  name = "github.com/docker/go-connections"
+

Makefile

@@ -138,11 +138,11 @@ test: deps format
 	go test -v -race -coverprofile=coverage.out -covermode=atomic ./gvfs/drivers
 	go tool cover -html=coverage.out -o coverage.html
 
-docs:
+docs: deps
 	@echo -e "$(OK_COLOR)==> Serving docs at http://localhost:$(DOC_PORT).$(NO_COLOR)"
 	@godoc -http=:$(DOC_PORT)
 
-lint: dev-deps
+lint: deps
 	gometalinter --deadline=5m --concurrency=2 --vendor --disable=gotype --errors ./...
 	gometalinter --deadline=5m --concurrency=2 --vendor --disable=gotype ./... || echo "Something could be improved !"
 #	gometalinter --deadline=5m --concurrency=2 --vendor ./... # disable gotype temporary
@@ -165,7 +165,7 @@ update-dev-deps:
 
 deps: dev-deps
 	@echo -e "$(OK_COLOR)==> Installing dependencies ...$(NO_COLOR)"
-	$(GOPATH)/bin/dep ensure
+	$(GOPATH)/bin/dep ensure -vendor-only
 
 update-deps: dev-deps
 	@echo -e "$(OK_COLOR)==> Updating all dependencies ...$(NO_COLOR)"

gvfs/gvfs.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"path/filepath"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/volume"
 	"github.com/sapk/docker-volume-gvfs/gvfs/drivers"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 

support/docker/Dockerfile

@@ -1,13 +1,14 @@
 FROM alpine:latest
 MAINTAINER Antoine GIRARD <antoine.girard@sapk.fr>
 
-ENV GOPATH=/usr/share/docker-volume-gvfs
-
-ADD . ${GOPATH}
+ENV GOPATH=/go
 
 RUN apk --no-cache --no-progress --force add \
-          build-tools make gcc go musl-dev git ca-certificates dbus dbus-x11 gvfs gvfs-fuse gvfs-dav gvfs-smb openssh-client\
- && cd $GOPATH && make \
+          build-tools make gcc go musl-dev git ca-certificates dbus dbus-x11 gvfs gvfs-fuse gvfs-dav gvfs-smb openssh-client
+
+ADD . ${GOPATH}/src/github.com/sapk/docker-volume-gvfs
+
+RUN cd $GOPATH/src/github.com/sapk/docker-volume-gvfs && make \
  && mv ./docker-volume-gvfs /usr/bin/docker-volume-gvfs \
  && cd && mkdir -p /var/lib/docker-volumes/gvfs /root/.ssh \
  && apk del --purge build-tools make gcc go musl-dev git \