From 0e34430ccade9e67319410b52061049cb63c0071 Mon Sep 17 00:00:00 2001
From: Derek Slager <derekslager@gmail.com>
Date: Thu, 14 Jul 2016 23:14:30 -0700
Subject: [PATCH 1/2] Manual golang install, avoids downstream build failures.

---
 Dockerfile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 272faf1..70c6475 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,10 +14,17 @@ RUN apt-get update
 # Install python prerequisites
 RUN apt-get install -y python-pip python-dev build-essential
 
-# Install go & libpcap
-RUN apt-get install -y golang libpcap-dev
+# Install libpcap
+RUN apt-get install -y libpcap-dev
+
+# Install go
+RUN echo 'e40c36ae71756198478624ed1bb4ce17597b3c19d243f3f0899bb5740d56212a go1.6.2.linux-amd64.tar.gz' >go.sha256sum \
+ && curl -s -L -o go1.6.2.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz \
+ && sha256sum -c go.sha256sum \
+ && tar -C /usr/local -xzf go1.6.2.linux-amd64.tar.gz
 
 # Install gor
+ENV PATH=$PATH:/usr/local/go/bin
 ENV GOPATH=/opt/go
 RUN mkdir -p $GOPATH \
  && go get github.com/buger/gor \

From 9f2b404c22edde107dbfb1b5f5adf6694b904353 Mon Sep 17 00:00:00 2001
From: Derek Slager <derekslager@gmail.com>
Date: Thu, 14 Jul 2016 23:16:42 -0700
Subject: [PATCH 2/2] Adding libraries required on newer Mesos clusters.

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 70c6475..f2ac38e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,10 @@ RUN mkdir -p $GOPATH \
  && cd $GOPATH/src/github.com/buger/gor \
  && go build
 
+# Aurora/Mesos requirements (see AURORA-1487)
+RUN apt-get update \
+ && apt-get install -y libcurl4-nss-dev libapr1-dev libsvn-dev
+
 # Install nginx
 ENV NGX_REQS openssl libssl1.0.0 libxml2 libxslt1.1 libgeoip1 libpcre3 zlib1g
 RUN apt-get update \