From 0a3580e8d934cf8fa810f3cab2053d4612e5b7e7 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <mfisher@deis.com>
Date: Wed, 8 Feb 2017 13:56:49 -0800
Subject: [PATCH] build helm binary in tiller image

---
 .gitignore        | 1 +
 Makefile          | 1 +
 rootfs/Dockerfile | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b94f87b26..7fdfdcf2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 _dist/
 _proto/*.pb.go
 bin/
+rootfs/helm
 rootfs/tiller
 rootfs/rudder
 vendor/
diff --git a/Makefile b/Makefile
index a8f778377..54cc1ff18 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ check-docker:
 docker-binary: BINDIR = ./rootfs
 docker-binary: GOFLAGS += -a -installsuffix cgo
 docker-binary:
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/helm $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/helm
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/tiller
 
 .PHONY: docker-build
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index ca5ad2225..ef426616a 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -14,10 +14,11 @@
 
 FROM alpine:3.7
 
-RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+RUN apk update && apk add ca-certificates socat && rm -rf /var/cache/apk/*
 
 ENV HOME /tmp
 
+COPY helm /bin/helm
 COPY tiller /bin/tiller
 
 EXPOSE 44134