From afbf63152b6d9e6ad972907e31428a11ac79d86c Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Thu, 26 Jan 2017 21:24:34 -0800
Subject: [PATCH] Upgrade vagrant/release to Ubuntu 16.04 / Go 1.7.5

Switch back to soft-float arm32 as armhf chips are backward compatible.
---
 Vagrantfile      | 32 ++++++++++++++------------------
 scripts/build.sh |  4 ++--
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index b1bb330f9..c1f8a20c9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,22 +6,18 @@ VAGRANTFILE_API_VERSION = "2"
 
 DEFAULT_CPU_COUNT = 2
 $script = <<SCRIPT
-GO_VERSION="1.7.4"
+GO_VERSION="1.7.5"
 
+sudo dpkg --add-architecture i386
 sudo apt-get update
 
 # Install base dependencies
-sudo apt-get install -y build-essential curl git-core mercurial bzr libpcre3-dev pkg-config zip default-jre qemu silversearcher-ag jq htop vim unzip liblxc1 lxc-dev tree
-
-# Install cross-compilation dependencies
-# ARM64 / Aarch64 compiler
-sudo apt-get install -y gcc-4.8-aarch64-linux-gnu binutils-aarch64-linux-gnu
-
-# ARM hard-float (32bit) compiler
-sudo apt-get install -y gcc-4.8-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
-
-# i386 dependencies
-sudo apt-get install -y libc6-dev-i386 linux-libc-dev:i386
+sudo apt-get install -y build-essential curl git-core mercurial bzr \
+     libpcre3-dev pkg-config zip default-jre qemu silversearcher-ag jq htop \
+     vim unzip liblxc1 lxc-dev tree \
+     gcc-5-aarch64-linux-gnu binutils-aarch64-linux-gnu \  # arm64
+     libc6-dev-i386 linux-libc-dev:i386                 \  # i386
+     gcc-5-arm-linux-gnueabi gcc-5-multilib-arm-linux-gnueabi binutils-arm-linux-gnueabi # arm
 
 # Setup go, for development of Nomad
 SRCROOT="/opt/go"
@@ -36,13 +32,13 @@ wget -q https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${ARCH}.tar.
 tar -xf go${GO_VERSION}.linux-${ARCH}.tar.gz
 sudo mv go $SRCROOT
 sudo chmod 775 $SRCROOT
-sudo chown vagrant:vagrant $SRCROOT
+sudo chown ubuntu:ubuntu $SRCROOT
 
 # Setup the GOPATH; even though the shared folder spec gives the working
 # directory the right user/group, we need to set it properly on the
 # parent path to allow subsequent "go get" commands to work.
 sudo mkdir -p $SRCPATH
-sudo chown -R vagrant:vagrant $SRCPATH 2>/dev/null || true
+sudo chown -R ubuntu:ubuntu $SRCPATH 2>/dev/null || true
 # ^^ silencing errors here because we expect this to fail for the shared folder
 
 cat <<EOF >/tmp/gopath.sh
@@ -63,8 +59,8 @@ sudo apt-get install -y docker-engine
 # Restart docker to make sure we get the latest version of the daemon if there is an upgrade
 sudo service docker restart
 
-# Make sure we can actually use docker as the vagrant user
-sudo usermod -aG docker vagrant
+# Make sure we can actually use docker as the ubuntu user
+sudo usermod -aG docker ubuntu
 
 # Setup Nomad for development
 cd /opt/gopath/src/github.com/hashicorp/nomad && make bootstrap
@@ -86,7 +82,7 @@ def configureVM(vmCfg, vmParams={
                   numCPUs: DEFAULT_CPU_COUNT,
                 }
                )
-  vmCfg.vm.box = "cbednarski/ubuntu-1404"
+  vmCfg.vm.box = "ubuntu/xenial64" # 16.04 LTS
 
   vmCfg.vm.provision "shell", inline: $script, privileged: false
   vmCfg.vm.synced_folder '.', '/opt/gopath/src/github.com/hashicorp/nomad'
@@ -98,7 +94,7 @@ def configureVM(vmCfg, vmParams={
   memory = 2048
 
   vmCfg.vm.provider "parallels" do |p, o|
-    o.vm.box = "parallels/ubuntu-14.04"
+    o.vm.box = "parallels/ubuntu-16.04"
     p.memory = memory
     p.cpus = cpus
   end
diff --git a/scripts/build.sh b/scripts/build.sh
index dc8b7437a..1273db8d8 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -33,10 +33,10 @@ if [[ $(uname) == "Linux" ]]; then
     CGO_ENBALED=1 GOARCH="amd64" GOOS="linux"   go build -ldflags "-X $LDFLAG" -o "pkg/linux_amd64-lxc/nomad" -tags "lxc"
 
     echo "==> Building linux arm..."
-    CC="arm-linux-gnueabihf-gcc-4.8" GOOS=linux GOARCH="arm"   CGO_ENABLED=1 go build -ldflags "-X $LDFLAG" -o "pkg/linux_arm/nomad"
+    CC="arm-linux-gnueabi-gcc-5" GOOS=linux GOARCH="arm"   CGO_ENABLED=1 go build -ldflags "-X $LDFLAG" -o "pkg/linux_arm/nomad"
 
     echo "==> Building linux arm64..."
-    CC="aarch64-linux-gnu-gcc-4.8"   GOOS=linux GOARCH="arm64" CGO_ENABLED=1 go build -ldflags "-X $LDFLAG" -o "pkg/linux_arm64/nomad"
+    CC="aarch64-linux-gnu-gcc-5"  GOOS=linux GOARCH="arm64" CGO_ENABLED=1 go build -ldflags "-X $LDFLAG" -o "pkg/linux_arm64/nomad"
 
     echo "==> Building windows 386..."
     CGO_ENABLED=1 GOARCH="386"   GOOS="windows" go build -ldflags "-X $LDFLAG" -o "pkg/windows_386/nomad"