Merge pull request #67 from square/cs/vendor

Checked-in vendor/ directory

.gitignore

@@ -13,5 +13,4 @@ eclipsebin
 *.iws
 *.out
 .DS_Store
-vendor/
 keywhiz-fs

.travis.yml

@@ -1,3 +1,4 @@
+---
 language: go
 
 sudo: required
@@ -13,14 +14,13 @@ before_script:
 - go vet
 
 before_install:
-- go get github.com/Masterminds/glide
 - go get github.com/axw/gocov/gocov
 - go get github.com/mattn/goveralls
 - go get golang.org/x/tools/cmd/cover
 - sudo apt-get install fuse
 
 install:
-- make build
+- make keywhiz-fs
 - docker build -t square/keywhiz-fs .
 
 script:

Dockerfile

@@ -4,8 +4,7 @@ MAINTAINER Diogo Monica "diogo@docker.com"
 
 # Install sshfs and dependencies
 RUN apt-get update && \
-    apt-get install -y sshfs sudo make git --no-install-recommends && \
-    go get github.com/Masterminds/glide
+    apt-get install -y sshfs sudo make --no-install-recommends
 
 # Add keywhiz user and group
 RUN useradd -ms /bin/false keywhiz
@@ -15,8 +14,8 @@ COPY . /go/src/github.com/square/keywhiz-fs
 
 # Install keywhizfs
 RUN cd /go/src/github.com/square/keywhiz-fs && \
-    glide install && \
-    go install .
+    make keywhiz-fs && \
+    cp keywhiz-fs /go/bin/keywhiz-fs
 
 # Allows keywhiz-fs to expose its filesystems to other users besides the owner of the process
 RUN echo "user_allow_other" >> /etc/fuse.conf

Makefile

@@ -1,28 +1,21 @@
-# Required for vendoring
-export GO15VENDOREXPERIMENT = 1
 # Required for os/user to work on cross-compile
 export CGO_ENABLED = 1
 
 BUILD_TIME := $(shell date +%s)
 BUILD_REVISION := $(shell git rev-parse --verify HEAD)
 BUILD_MACHINE := $(shell uname -mnrs)
 
+SOURCE_FILES := $(shell find . \( -name '*.go' -not -path './vendor/*' \))
+
 # Build
-build: depends
+keywhiz-fs: $(SOURCE_FILES)
 	go build -ldflags "-s -w \
 	  -X \"main.buildTime=$(BUILD_TIME)\" \
 	  -X \"main.buildRevision=$(BUILD_REVISION)\" \
 	  -X \"main.buildMachine=$(BUILD_MACHINE)\""
 
-# Dependencies
-depends:
-	glide -q install
-
-update-depends:
-	glide -q update
-
 # Run all tests
-test: unit
-
-unit:
+test:
 	go test -v -coverprofile coverage.out
+
+.PHONY: test

README.md

@@ -28,9 +28,11 @@ KeywhizFs will display all secrets under the top level directory of the mountpoi
 
 # Building
 
-Install glide (`go get github.com/Masterminds/glide` or `brew install glide` if you are on Mac OS X).
+Run `make keywhiz-fs` to build a binary and `make test` to run tests.
 
-Run `make build` to build a binary and `make test` to run tests.
+We use [glide][1] to manage vendored dependencies.
+
+[1]: https://glide.sh
 
 # Running