Skip to content

Commit

Permalink
helm 2.4.2, kubectl 1.6.4 (#1)
Browse files Browse the repository at this point in the history
* new travis yaml build
* update versions for image
  • Loading branch information
dtzar authored Jun 9, 2017
1 parent a23c3ca commit 9aa1b39
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
sudo: required

env:
DOCKER_IMAGE=dtzar/helm-kubectl
DOCKER_TAG=2.4.2

services:
- docker

script:
- docker build --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t $DOCKER_IMAGE:$DOCKER_TAG .
- docker tag $DOCKER_IMAGE:$DOCKER_TAG $DOCKER_IMAGE:latest

after_success:
- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
- docker push $DOCKER_IMAGE:$DOCKER_TAG
- docker push $DOCKER_IMAGE:latest
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@ ARG BUILD_DATE

# Metadata
LABEL org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.name="helm-kubectl" \
org.lable-schema.url="https://hub.docker.com/r/dtzar/helm-kubectl/" \
org.label-schema.vcs-url="https://github.com/dtzar/helm-kubectl" \
org.label-schema.build-date=$BUILD_DATE \
org.label-schema.docker.dockerfile="/Dockerfile"
org.label-schema.build-date=$BUILD_DATE

# Note: Latest version of kubectl may be found at:
# https://aur.archlinux.org/packages/kubectl-bin/
ENV KUBE_LATEST_VERSION="v1.6.2"
ENV KUBE_LATEST_VERSION="v1.6.4"
# Note: Latest version of helm may be found at:
# https://github.com/kubernetes/helm/releases
ENV HELM_VERSION="v2.4.1"
ENV HELM_VERSION="v2.4.2"
ENV FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"

RUN apk add --update ca-certificates \
Expand Down
20 changes: 14 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

Supported tags and release links

* [2.4.2](https://github.com/dtzar/helm-kubectl/releases/tag/2.4.2) - helm v2.4.2, kubectl v1.6.4, alpine 3.6
* [2.4.1](https://github.com/dtzar/helm-kubectl/releases/tag/2.4.1) - helm v2.4.1, kubectl v1.6.2, alpine 3.5
* [2.3.1](https://github.com/dtzar/helm-kubectl/releases/tag/2.3.1) - helm v2.3.1, kubectl v1.6.2, alpine 3.5

Expand All @@ -16,14 +17,21 @@ If it is desired to only use kubectl and have kubectl as the entry command (vers
* [lachlanevenson/kubectl](https://hub.docker.com/r/lachlanevenson/k8s-kubectl/)
* [wernight/kubectl](https://hub.docker.com/r/wernight/kubectl/)

## Build
## Run

`make docker_build`
Example to just run helm on entry:
`docker run --rm dtzar/helm-kubectl helm`
By default kubectl will try to use /root/.kube/config file for connection to the kubernetes cluster, but does not exist by default in the image.

## Run
Example for use with personal administration or troubleshooting with volume mount for kubeconfig files:
`docker run -it -v ~/.kube:/root/.kube dtzar/helm-kubectl`
The -v maps your host docker machine Kubernetes configuration directory (~/.kube) to the container's Kubernetes configuration directory (root/.kube).

This example run command is for use with personal administration or troubleshooting.
## Build

`docker run -it -v ~/.kube:/root/.kube dtzar/helm-kubectl`
For doing a manual local build of the image:
`make docker_build`

The -v maps your host docker machine Kubernetes configuration directory (~/.kube) to the container's Kubernetes configuration directory (root/.kube).
This image is now fully automated via travisci.org.
For reference this .travis.yml file can be validated via:
`docker run --rm -it -v yourclonedreporoot:/project caktux/travis-cli lint ./travis.yml`

0 comments on commit 9aa1b39

Please sign in to comment.