Merge pull request #44 from ibuildthecloud/image

Build rancher/cli image

Author: ibuildthecloud

README.md

@@ -40,6 +40,12 @@ Run `make`.
 
 Run `CROSS=1 make build`
 
+### Docker image
+
+Run `docker run --rm -it rancher/cli [ARGS]`  You can pass in credentials by bind mounting in a config file or setting env vars.  You can also use the wrapper script in `./contrib/rancher` that will make the process a bit easier.
+
+To build `rancher/cli` just run `make`.  To use a custom Docker repository do `REPO=custom make` and it will producte `custom/cli` image.
+
 ## Contact
 
 For bugs, questions, comments, corrections, suggestions, etc., open an issue in

cli-docker/Dockerfile

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+[[ -d ~/.rancher ]] || mkdir -p  ~/.rancher
+[[ -d ~/.ssh ]] || mkdir -p  ~/.ssh
+[[ -e ~/.ssh/known_hosts ]] || touch ~/.ssh/known_hosts
+[[ -e ~/.rancher/cli.json ]] || echo "{"accessKey":"","secretKey":"","url":"","environment":""}" >  ~/.rancher/cli.json
+
+IMAGE=${IMAGE:-rancher/cli}
+
+exec docker run --rm -it --net host -v ~/.rancher/cli.json:/root/.rancher/cli.json  -v ~/.ssh/known_hosts:/root/.ssh/known_hosts -v $(pwd):/mnt ${IMAGE} "$@"

cli-docker/rancher

@@ -1,3 +1,6 @@
-FROM alpine
-COPY bin/rancher /usr/bin/
+FROM alpine:3.5
+RUN apk add --no-cache ca-certificates openssh-client
+COPY rancher /usr/bin/
+WORKDIR /mnt
 ENTRYPOINT ["rancher"]
+CMD  ["--help"]

contrib/rancher

@@ -12,7 +12,7 @@ OS_ARCH_ARG[windows]="386 amd64"
 OS_ARCH_ARG[darwin]="amd64"
 
 go generate
-go build -ldflags="-w -s -X main.VERSION=$VERSION" -o bin/rancher
+CGO_ENABLED=0 go build -ldflags="-w -s -X main.VERSION=$VERSION -linkmode external -extldflags -static" -o bin/rancher
 
 if [ -n "$CROSS" ]; then
     rm -rf build/bin

package/Dockerfile

@@ -56,3 +56,23 @@ for i in build/bin/*; do
         fi
     )
 done
+
+
+ARCH=${ARCH:-"amd64"}
+SUFFIX=""
+[ "${ARCH}" != "amd64" ] && SUFFIX="_${ARCH}"
+
+cd package
+
+TAG=${TAG:-${VERSION}${SUFFIX}}
+REPO=${REPO:-rancher}
+
+if echo $TAG | grep -q dirty; then
+    TAG=dev
+fi
+
+cp ../bin/rancher .
+docker build -t ${REPO}/cli:${TAG} .
+
+echo ${REPO}/cli:${TAG} > ../dist/images
+echo Built ${REPO}/cli:${TAG}