From 1c8b1241ff0d99aa529c63a942e0221ce4f47c73 Mon Sep 17 00:00:00 2001
From: David Xia <dxia@spotify.com>
Date: Tue, 5 Apr 2016 18:00:00 -0400
Subject: [PATCH] [solo] Fix solo base image build; bump its version

Skydns now needs to be compiled with go 1.5+.
---
 solo/base/Dockerfile   | 2 +-
 solo/base/version.txt  | 2 +-
 solo/docker/Dockerfile | 2 +-
 solo/docker/start.sh   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/solo/base/Dockerfile b/solo/base/Dockerfile
index 0f074c835..94146e2b7 100644
--- a/solo/base/Dockerfile
+++ b/solo/base/Dockerfile
@@ -14,7 +14,7 @@ RUN curl -o $SKYDNS_PLUGIN_DEB -L $SKYDNS_PLUGIN_DEB_URI \
     && rm $SKYDNS_PLUGIN_DEB
 
 # Install Go (from the official golang Dockerfile)
-ENV GOLANG_VERSION 1.4.2
+ENV GOLANG_VERSION 1.6
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
diff --git a/solo/base/version.txt b/solo/base/version.txt
index bd73f4707..2eb3c4fe4 100644
--- a/solo/base/version.txt
+++ b/solo/base/version.txt
@@ -1 +1 @@
-0.4
+0.5
diff --git a/solo/docker/Dockerfile b/solo/docker/Dockerfile
index 3e0ac7332..46e137bf6 100644
--- a/solo/docker/Dockerfile
+++ b/solo/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM spotify/helios-solo-base:0.4
+FROM spotify/helios-solo-base:0.5
 
 EXPOSE 5801
 
diff --git a/solo/docker/start.sh b/solo/docker/start.sh
index eecf54804..e2153db82 100755
--- a/solo/docker/start.sh
+++ b/solo/docker/start.sh
@@ -23,7 +23,7 @@ done
 curl -XPUT http://127.0.0.1:4001/v2/keys/skydns/${SKYDNS_PATH} \
     -d value="{\"host\":\"$HOST_ADDRESS\"}"
 
-skydns $SKYDNS_OPTS &
+skydns $SKYDNS_OPTS -verbose &
 
 /usr/share/zookeeper/bin/zkServer.sh start