Merge pull request #4 from strava/dr/new-rebase

Dr/new rebase

.gitignore

@@ -5,7 +5,7 @@ config/private.json
 config/local.json
 Godeps/Readme
 *.iml
-bamboo
+/bamboo
 node_modules
 .sass-cache
 builder/build

.travis.yml

@@ -2,16 +2,21 @@ language: go
 
 sudo: false
 
+addons:
+  apt:
+    packages:
+      - zookeeperd
+
 go:
-  - 1.4
+  - 1.7
 
 install:
   # WORKING DIR
   # $HOME/gopath/src/github.com/QubitProducts/bamboo
   - export PATH=$PATH:$HOME/gopath/bin
 
   # Install build dependencies
-  - go get bitbucket.org/tebeka/go2xunit
+  - go get github.com/tebeka/go2xunit
   - go get github.com/smartystreets/assertions
   - go get -t github.com/smartystreets/goconvey
   - go get -v -u github.com/tools/godep
@@ -20,10 +25,11 @@ install:
 
 # Tests should fail if go fmt is required
 script:
+  - godep restore
   - '[[ -z "$(go fmt ./... | tee -a /dev/stderr)" ]]'
   - go vet ./...
   - go test -v ./...
-  - overalls -project=github.com/QubitProducts/bamboo -covermode=count -debug -ignore=Godeps,webapp,builder,.git
+  - overalls -project=github.com/QubitProducts/bamboo -covermode=count -debug -ignore=Godeps,webapp,builder,.git,vendor
   - goveralls -coverprofile=./overalls.coverprofile -service=travis-ci
 
 notifications:

Dockerfile

@@ -1,25 +1,47 @@
-FROM ubuntu:15.10
+# Need latest haproxy
+FROM ubuntu:xenial
 
 ENV DEBIAN_FRONTEND noninteractive
-ENV GOPATH /opt/go
+
+# 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 && \
-    add-apt-repository -y ppa:vbernat/haproxy-1.5 && \
-    apt-get update -yqq && \
-    apt-get install -yqq haproxy golang git mercurial supervisor && \
+    apt-get install -yqq haproxy git mercurial supervisor && \
     rm -rf /var/lib/apt/lists/*
 
-ADD . /opt/go/src/github.com/QubitProducts/bamboo
+
+ADD . /go/src/github.com/QubitProducts/bamboo
 ADD builder/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 ADD builder/run.sh /run.sh
 
-WORKDIR /opt/go/src/github.com/QubitProducts/bamboo
+WORKDIR /go/src/github.com/QubitProducts/bamboo
 
 RUN go get github.com/tools/godep && \
     go get -t github.com/smartystreets/goconvey && \
     go build && \
-    ln -s /opt/go/src/github.com/QubitProducts/bamboo /var/bamboo && \
+    ln -s /go/src/github.com/QubitProducts/bamboo /var/bamboo && \
     mkdir -p /run/haproxy && \
     mkdir -p /var/log/supervisor
 

Dockerfile-deb

@@ -1,16 +1,14 @@
-FROM ubuntu:14.04
+FROM golang:1.7.0
 
 ENV DEBIAN_FRONTEND noninteractive
-ENV GOPATH /opt/go
 
 RUN apt-get update -yqq
-RUN apt-get install -yqq software-properties-common curl git mercurial ruby-dev gcc make
-RUN add-apt-repository -y ppa:ethereum/ethereum && apt-get update && apt-get -y install golang
+RUN apt-get install -yqq software-properties-common curl git mercurial ruby-dev gcc make rubygems
 RUN gem install fpm
 
-ADD . /opt/go/src/github.com/QubitProducts/bamboo
+ADD . /go/src/github.com/QubitProducts/bamboo
 
-WORKDIR /opt/go/src/github.com/QubitProducts/bamboo
+WORKDIR /go/src/github.com/QubitProducts/bamboo
 RUN go get github.com/tools/godep && \
     go get -t github.com/smartystreets/goconvey && \
     go build