Revert "Switch to new vendor directory layout"

This reverts commit d5742209d3.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
 ENV GO_VERSION 1.5.2
 RUN curl -sSL  "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar -v -C /usr/local -xz
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
+ENV GOPATH /go:/go/src/github.com/docker/containerd/vendor
 
 # install golint/vet
 RUN go get github.com/golang/lint/golint \
@@ -21,5 +21,9 @@ RUN go get github.com/golang/lint/golint \
 
 COPY . /go/src/github.com/docker/containerd
 
+# get deps, until they are in vendor
+# TODO: remomve this when there is a dep tool
+RUN go get -d -v github.com/docker/containerd/ctr \
+	&& go get -d -v github.com/docker/containerd/containerd
 
 WORKDIR /go/src/github.com/docker/containerd

Makefile

@@ -11,7 +11,7 @@ endif
 DOCKER_IMAGE := containerd-dev$(if $(GIT_BRANCH),:$(GIT_BRANCH))
 DOCKER_RUN := docker run --rm -i $(DOCKER_FLAGS) "$(DOCKER_IMAGE)"
 
-export GO15VENDOREXPERIMENT:=1
+export GOPATH:=$(CURDIR)/vendor:$(GOPATH)
 
 all: client daemon shim