Fix build for godeps and upgrade haproxy version

Dockerfile

@@ -1,12 +1,37 @@
-FROM golang:1.6.2
+# Need latest haproxy
+FROM ubuntu:xenial
 
 ENV DEBIAN_FRONTEND noninteractive
 
+# gcc for cgo
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        g++ \
+        gcc \
+        libc6-dev \
+        make curl openssl ca-certificates
+
+ENV GOLANG_VERSION 1.7.1
+ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
+ENV GOLANG_DOWNLOAD_SHA256 43ad621c9b014cde8db17393dc108378d37bc853aa351a6c74bf6432c1bbd182
+
+RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
+    && echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
+    && tar -C /usr/local -xzf golang.tar.gz \
+    && rm golang.tar.gz
+
+ENV GOPATH /go
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+
+RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
+WORKDIR $GOPATH
+
+
 RUN apt-get update -yqq && \
     apt-get install -yqq software-properties-common && \
     apt-get install -yqq haproxy git mercurial supervisor && \
     rm -rf /var/lib/apt/lists/*
 
+
 ADD . /go/src/github.com/QubitProducts/bamboo
 ADD builder/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 ADD builder/run.sh /run.sh

configuration/marathon.go

@@ -1,7 +1,7 @@
 package configuration
 
 import (
-	"github.com/QubitProducts/bamboo/Godeps/_workspace/src/github.com/samuel/go-zookeeper/zk"
+	"github.com/samuel/go-zookeeper/zk"
 	"strings"
 	"time"
 )

services/haproxy/haproxy.go

@@ -25,5 +25,10 @@ func GetTemplateData(config *conf.Configuration, storage service.Storage) (*temp
 		return nil, err
 	}
 
-	return &templateData{apps, services, config.HAProxy}, nil
+	byName := make(map[string]service.Service)
+	for _, service := range services {
+		byName[service.Id] = service
+	}
+
+	return &templateData{apps, byName, config.HAProxy}, nil
 }

services/marathon/marathon_test.go

@@ -1,11 +1,8 @@
 package marathon
 
 import (
+	. "github.com/smartystreets/goconvey/convey"
 	"testing"
-
-	. "github.com/QubitProducts/bamboo/Godeps/_workspace/src/github.com/smartystreets/goconvey/convey"
-	conf "github.com/QubitProducts/bamboo/configuration"
-	"github.com/QubitProducts/bamboo/services/service"
 )
 
 func TestAcl(t *testing.T) {

services/template/template.go

@@ -2,11 +2,10 @@ package template
 
 import (
 	"bytes"
-	"strings"
-	"text/template"
-
 	"github.com/QubitProducts/bamboo/services/marathon"
 	"github.com/QubitProducts/bamboo/services/service"
+	"strings"
+	"text/template"
 )
 
 func hasKey(data map[string]service.Service, appId string) bool {