From: Gabe Rosenhouse <grosenhouse@pivotal.io>
Date: Wed, 7 Jun 2017 03:40:07 +0000 (-0700)
Subject: Vagrantfile updates
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=e5a22d1aaf49f018bf2e547a574fb2e8bc471de9;p=cni.git

Vagrantfile updates

- installs latest Golang
---

diff --git a/Vagrantfile b/Vagrantfile
index 93b2866..0a25715 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,11 +10,17 @@ Vagrant.configure(2) do |config|
     set -e -x -u
 
     apt-get update -y || (sleep 40 && apt-get update -y)
-    apt-get install -y golang git
-    echo "export GOPATH=/go" >> /root/.bashrc
-    export GOPATH=/go
+    apt-get install -y git
+
+    wget -qO- https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar -C /usr/local -xz
+
+    echo 'export GOPATH=/go; export PATH=/usr/local/go/bin:$GOPATH/bin:$PATH' >> /root/.bashrc
+    eval `tail -n1 /root/.bashrc`
+
     go get github.com/tools/godep
+
     cd /go/src/github.com/containernetworking/cni
-    /go/bin/godep restore
+    godep restore
+
   SHELL
 end