From c882e5e5a76f8003f98e1895822fdeacf649218e Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Sat, 23 Apr 2016 00:45:51 -0700
Subject: [PATCH] rollback to Go 1.5.4

Signed-off-by: Victor Vieux <vieux@docker.com>
---
 .travis.yml                 | 3 ++-
 CONTRIBUTING.md             | 2 +-
 Dockerfile                  | 4 ++--
 test/integration/Dockerfile | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 849bc8407c..ed6635ff5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.6.2
+  - 1.5.4
 
 # let us have speedy Docker-based Travis workers
 sudo: false
@@ -18,6 +18,7 @@ script:
   - fgt golint ./... | grep -v vendor/ | tee /dev/stderr
   # Lint shell files and make sure they are not space indented.
   - fgt find test/ -type f \( -name "*.sh" -or -name "*.bash" -or -name "*.bats" \) -exec grep -Hn -e "^ " {} \;
+  - export GO15VENDOREXPERIMENT=1
   - GOOS=darwin go build
   - GOOS=windows go build
   - GOOS=linux go build
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7e40bafe65..3b8799986a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,7 +25,7 @@ sudo apt-get install git
 
 You also need Go 1.5 or higher.  Download Go from [https://golang.org/dl/](https://golang.org/dl/).  To install on Linux:
 ```sh
-tar xzvf go1.6.2.linux-amd64.tar.gz
+tar xzvf go1.5.4.linux-amd64.tar.gz
 sudo mv go /usr/local
 ```
 
diff --git a/Dockerfile b/Dockerfile
index f54575d234..e7a84aef33 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM golang:1.6.2-alpine
+FROM golang:1.5.4-alpine
 
 ARG GOOS
 
 COPY . /go/src/github.com/docker/swarm
 WORKDIR /go/src/github.com/docker/swarm
 
-ENV GOPATH /go/src/github.com/docker/swarm/Godeps/_workspace:$GOPATH
+ENV GO15VENDOREXPERIMENT=1
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .build-deps \
diff --git a/test/integration/Dockerfile b/test/integration/Dockerfile
index b7a2c0d425..7602a51ad5 100644
--- a/test/integration/Dockerfile
+++ b/test/integration/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git file parall
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install golang
-ENV GO_VERSION 1.6.2
+ENV GO_VERSION 1.5.4
 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