Unverified Commit 1c259297 authored by Matthew Fisher's avatar Matthew Fisher Committed by GitHub

Merge pull request #1929 from bacongobbler/helm-image

build helm binary in tiller image
parents 3771ef86 0a3580e8
......@@ -5,6 +5,7 @@
_dist/
_proto/*.pb.go
bin/
rootfs/helm
rootfs/tiller
rootfs/rudder
vendor/
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment