Merge pull request #132 from marcosnils/vendor_layout

Switch to new vendor directory layout

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:/go/src/github.com/docker/containerd/vendor
+ENV GOPATH /go
 
 # install golint/vet
 RUN go get github.com/golang/lint/golint \
@@ -21,9 +21,5 @@ 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,9 +11,16 @@ endif
 DOCKER_IMAGE := containerd-dev$(if $(GIT_BRANCH),:$(GIT_BRANCH))
 DOCKER_RUN := docker run --rm -i $(DOCKER_FLAGS) "$(DOCKER_IMAGE)"
 
-export GOPATH:=$(CURDIR)/vendor:$(GOPATH)
+export GO15VENDOREXPERIMENT:=1
+GOLANG_VERSION:=$(shell go version | cut -d ' ' -f3 | cut -c 3-)
 
-all: client daemon shim
+
+all: check_version client daemon shim
+
+check_version:
+ifneq ($(shell /bin/echo -e "1.5\n${GOLANG_VERSION}" | sort -V | head -n1),1.5)
+	$(error "Golang 1.5+ required to build containerd. Current version: ${GOLANG_VERSION}")
+endif
 
 bin:
 	mkdir -p bin/

README.md

@@ -19,7 +19,7 @@ For more documentation on various subjects refer to the `/docs` directory in thi
 
 ## Building
 
-You will need to make sure that you have Go installed on your system and the containerd repository is cloned
+You will need to make sure that you have Go 1.5+ installed on your system and the containerd repository is cloned
 in your `$GOPATH`.  You will also need to make sure that you have all the dependencies cloned as well.
 Currently, contributing to containerd is not for the first time devs as many dependencies are not vendored and 
 work is being completed at a high rate.