Merge pull request #2 from deis/vendor

chore(*): vendoring all dependencies

Author: Sivaram Mothiki

.gitignore

@@ -1,2 +1,3 @@
 rootfs/bin/boot
 vendor/
+rootfs/usr/bin/

Makefile

@@ -40,10 +40,13 @@ all:
 # This illustrates a two-stage Docker build. docker-compile runs inside of
 # the Docker environment. Other alternatives are cross-compiling, doing
 # the build as a `docker build`.
-build:
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/builder cli/builder.go || exit 1
-	mkdir -p ${BINDIR}/bin
-	docker run --rm -v ${PWD}:/app -w /app golang:1.5.1 make docker-compile
+#
+# Aaron(2015-11-17) doesn't work, commented out. use 'make docker-build-bpb' instead
+#
+# build:
+# 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/builder boot.go || exit 1
+# 	mkdir -p ${BINDIR}/bin
+# 	docker run --rm -v ${PWD}:/app -w /app golang:1.5.1 make docker-compile
 
 docker-build-bpb:
 	cp -r bpbuilder/etcd pkg/

glide.yaml

@@ -0,0 +1,20 @@
+package: main
+import:
+- package: github.com/coreos/go-etcd
+  subpackages:
+  - /etcd
+- package: github.com/deis/deis
+  subpackages:
+  - /buildpack/builder/sshd
+  - /pkg/time
+- package: github.com/gorilla/mux
+- package: github.com/gorilla/context
+- package: github.com/Masterminds/cookoo
+  subpackages:
+  - /log
+  - /safely
+  - /fmt
+- package: golang.org/x/crypto
+  subpackages:
+  - /ssh
+- package: gopkg.in/yaml.v2

pkg/builder.go

@@ -8,7 +8,7 @@ package pkg
 import (
 	"github.com/Masterminds/cookoo"
 	clog "github.com/Masterminds/cookoo/log"
-	"github.com/deis/deis/buildpack/builder/sshd"
+	"github.com/deis/builder/pkg/sshd"
 
 	"log"
 	"os"