Add get helper script and include commit info in binaries

Author: alexellis

.gitignore

@@ -1,6 +1,8 @@
 **/node_modules/
 build/
 faas-cli
-faas-cli-macos
+faas-cli-darwin
+faas-cli-armhf
+
 *.jpg
 *.pyc

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /go/src/github.com/alexellis/faas-cli
 COPY . .
 RUN go get -d -v
 
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o faas-cli .
+RUN CGO_ENABLED=0 GOOS=linux go build --ldflags "-X main.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli .
 
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates

Dockerfile.redist

@@ -0,0 +1,21 @@
+FROM golang:1.7.5
+
+WORKDIR /go/src/github.com/alexellis/faas-cli
+COPY . .
+RUN go get -d -v
+
+RUN GIT_COMMIT=$(git rev-list -1 HEAD) \
+ && GOARCH=arm GOARM=6 CGO_ENABLED=0 GOOS=linux go build --ldflags "-X main.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli-armhf . \
+ && CGO_ENABLED=0 GOOS=darwin go build --ldflags "-X main.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli-darwin \
+ && CGO_ENABLED=0 GOOS=linux go build --ldflags "-X main.GitCommit=${GIT_COMMIT}" -a -installsuffix cgo -o faas-cli .
+
+FROM alpine:latest
+RUN apk --no-cache add ca-certificates
+
+WORKDIR /root/
+
+COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli    .
+COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-darwin    .
+COPY --from=0 /go/src/github.com/alexellis/faas-cli/faas-cli-armhf    .
+
+CMD ["./faas"]

app.go

@@ -27,6 +27,7 @@ import (
 
 const providerName = "faas"
 const defaultNetwork = "func_functions"
+var GitCommit string
 
 func main() {
 	// var handler string
@@ -42,6 +43,7 @@ func main() {
 	var nocache bool
 	var yamlFile string
 	var yamlFileShort string
+	var version bool
 
 	flag.StringVar(&handler, "handler", "", "handler for function, i.e. handler.js")
 	flag.StringVar(&image, "image", "", "Docker image name to build")
@@ -55,9 +57,15 @@ func main() {
 
 	flag.StringVar(&yamlFile, "yaml", "", "use a yaml file for a set of functions")
 	flag.StringVar(&yamlFileShort, "f", "", "use a yaml file for a set of functions (same as -yaml)")
+        flag.BoolVar(&version, "version", false, "show version and quit")        
 
 	flag.Parse()
 
+        if version {
+		fmt.Printf("Git Commit: %s\n", GitCommit)
+		return
+        }
+
 	// support short-argument -f
 	if len(yamlFile) == 0 && len(yamlFileShort) > 0 {
 		yamlFile = yamlFileShort

get.sh

@@ -0,0 +1,60 @@
+version=0.3
+
+hasCli() {
+    has=$(which faas-cli)
+
+    if [ "$?" = "0" ]; then
+        echo "You already have the faas-cli!"
+        export n=1
+        echo "Overwriting in $n seconds.. Press Control+C to cancel."
+        sleep $n
+    fi
+
+    hasCurl=$(which curl)
+    if [ "$?" = "1" ]; then
+        echo "You need curl to use this script."
+        exit 1
+    fi
+}
+
+getPackage() {
+
+    uname=$(uname)
+
+    suffix=""
+    case $uname in 
+    "Darwin")
+    suffix="-darwin"
+    ;;
+    "Linux")
+        arch=$(uname -m)
+        echo $arch
+        case $arch in
+        "armv6l" | "armv7l")
+        suffix="-armhf"
+        ;;
+        esac
+    ;;
+    esac
+
+    if [ -e /tmp/faas-cli ]; then
+        rm /tmp/faas-cli
+    fi
+
+    url=https://github.com/alexellis/faas-cli/releases/download/$version/faas-cli$suffix
+    echo "Getting package $url"
+
+    curl -sSL $url > /tmp/faas-cli
+
+    if [ "$?" = "0" ]; then
+        echo "Attemping to move faas-cli to /usr/local/bin"
+        chmod +x /tmp/faas-cli
+        cp /tmp/faas-cli /usr/local/bin/
+        if [ "$?" = "0" ]; then
+            echo "New version of faas-cli installed to /usr/local/bin"
+        fi
+    fi
+}
+
+hasCli
+getPackage