From 64aea8540329855a0dece159afc653f5f0375e5c Mon Sep 17 00:00:00 2001
From: jackgr <jackgr@google.com>
Date: Mon, 22 Feb 2016 18:24:13 -0800
Subject: [PATCH] Move to golang:1.6

---
 dm/Dockerfile               |  2 +-
 expandybird/Dockerfile      | 18 ++++++++----------
 manager/Dockerfile          |  2 +-
 manager/manager/expander.go |  2 +-
 resourcifier/Dockerfile     |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/dm/Dockerfile b/dm/Dockerfile
index 75f49814c..8590cd65a 100644
--- a/dm/Dockerfile
+++ b/dm/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.4-cross
+FROM golang:1.6
 
 ENV GOLANG_CROSSPLATFORMS \
 	darwin/amd64 \
diff --git a/expandybird/Dockerfile b/expandybird/Dockerfile
index e445fd27b..f671ea7f4 100644
--- a/expandybird/Dockerfile
+++ b/expandybird/Dockerfile
@@ -22,9 +22,8 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# following lines copied from golang:1.4
+# following lines copied from golang:1.6
 
-# gcc for cgo
 RUN apt-get update && apt-get install -y --no-install-recommends \
         g++ \
         gcc \
@@ -32,18 +31,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         make \
     && rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.4.3
-ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz
-ENV GOLANG_DOWNLOAD_SHA1 486db10dc571a55c8d795365070f66d343458c48
+ENV GOLANG_VERSION 1.6
+ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
+ENV GOLANG_DOWNLOAD_SHA256 5470eac05d273c74ff8bac7bef5bad0b5abbd1c4052efbdbc8db45332e836b0b
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
-    && echo "$GOLANG_DOWNLOAD_SHA1  golang.tar.gz" | sha1sum -c - \
-    && tar -C /usr/src -xzf golang.tar.gz \
-    && rm golang.tar.gz \
-    && cd /usr/src/go/src && ./make.bash --no-clean 2>&1
+    && 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/src/go/bin:$PATH
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 34bd5de4f..5e62c9358 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.4
+FROM golang:1.6
 MAINTAINER Jack Greenfield <jackgr@google.com>
 
 RUN apt-get update \
diff --git a/manager/manager/expander.go b/manager/manager/expander.go
index 333804dab..e61ec2b82 100644
--- a/manager/manager/expander.go
+++ b/manager/manager/expander.go
@@ -192,7 +192,7 @@ func (e *expander) expandTemplate(t *common.Template) (*ExpandedTemplate, error)
 
 	response, err := http.Post(e.getBaseURL(), "application/json", ioutil.NopCloser(bytes.NewReader(j)))
 	if err != nil {
-		e := fmt.Errorf("call failed (%s) with payload:\n%s\n", e.getBaseURL(), err, string(j))
+		e := fmt.Errorf("call failed (%s) with payload:\n%s\n", err, string(j))
 		return nil, e
 	}
 
diff --git a/resourcifier/Dockerfile b/resourcifier/Dockerfile
index 6760254c9..c02984055 100644
--- a/resourcifier/Dockerfile
+++ b/resourcifier/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.4
+FROM golang:1.6
 
 RUN apt-get update \
     && apt-get autoremove -y \