Skip to content

Commit bc6c28c

Browse files
authored
Merge pull request #78 from mboersma/add-helm-and-kubectl
feat(Dockerfile): add helm and kubectl
2 parents f4063b6 + 5bc9d32 commit bc6c28c

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ creating [issues][] and submitting [pull requests][].
1515
* [glide][]: go dependency management
1616
* [golint][]: go source code linter
1717
* [gox][]: simple go cross-compiling tool
18+
* [helm][]: Kubernetes package manager
1819
* [jq][]: command-line JSON processor
20+
* [kubectl][]: Kubernetes command-line client
1921
* [shellcheck][]: static analysis for shell scripts
2022
* [test-cover.sh][]: test coverage for multiple go packages
2123
* [upx][]: executable packer
@@ -54,8 +56,10 @@ The latest deis/go-dev Docker image is available at:
5456
[Go]: https://golang.org/
5557
[golint]: https://github.com/golang/lint
5658
[gox]: https://github.com/mitchellh/gox
59+
[helm]: https://github.com/kubernetes/helm
5760
[issues]: https://github.com/deis/docker-go-dev/issues
5861
[jq]: https://stedolan.github.io/jq/
62+
[kubectl]: https://kubernetes.io/docs/user-guide/kubectl-overview/
5963
[official go Docker image]: https://hub.docker.com/_/golang/
6064
[pull requests]: https://github.com/deis/docker-go-dev/pulls
6165
[Quay.io]: https://quay.io

rootfs/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ FROM quay.io/deis/base:v0.3.6
33
ENV GO_VERSION=1.8.3 \
44
GLIDE_VERSION=v0.12.3 \
55
GLIDE_HOME=/root \
6+
HELM_VERSION=v2.4.2 \
7+
KUBECTL_VERSION=v1.6.4 \
68
SHELLCHECK_VERSION=v0.4.6 \
79
PATH=$PATH:/usr/local/go/bin:/go/bin:/usr/local/bin/docker \
810
GOPATH=/go
@@ -29,6 +31,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
2931
&& curl -sSL -o /tmp/protoc.zip https://github.com/google/protobuf/releases/download/v3.1.0/protoc-3.1.0-linux-x86_64.zip \
3032
&& unzip /tmp/protoc.zip 'bin/protoc' -d /usr/local \
3133
&& rm /tmp/protoc.zip \
34+
&& curl -sSL https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
35+
&& chmod +x /usr/local/bin/kubectl \
36+
&& curl -sSL https://storage.googleapis.com/kubernetes-helm/helm-$HELM_VERSION-linux-amd64.tar.gz \
37+
| tar -vxz -C /usr/local/bin --strip=1 \
3238
&& apt-get purge -y --auto-remove \
3339
unzip \
3440
&& apt-get autoremove -y \

0 commit comments

Comments
 (0)