Update to use Go 1.13

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

.gitignore

@@ -1,2 +1,3 @@
-jaas
+/bin/*
+/jaas
 

.travis.yml

@@ -2,9 +2,6 @@ sudo: required
 
 services:
       - docker
-before_install:
-    - docker pull golang:1.9.2
 
 script:
     - make docker
-

Dockerfile

@@ -1,7 +1,10 @@
-FROM golang:1.11 as build
+FROM golang:1.13 as build
 
-LABEL maintainer [email protected]
+ENV GO111MODULE=off
 ENV CGO_ENABLED=0
+
+LABEL maintainer [email protected]
+
 RUN mkdir -p /go/src/github.com/alexellis/jaas
 WORKDIR /go/src/github.com/alexellis/jaas
 
@@ -15,7 +18,7 @@ RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags
     && GIT_COMMIT=$(git rev-list -1 HEAD) \
     && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w -X github.com/alexellis/jaas/version.GitCommit=${GIT_COMMIT} -X github.com/alexellis/jaas/version.Version=${VERSION}" -a -installsuffix cgo -o /root/jaas
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 WORKDIR /root/
 COPY --from=build /root/jaas /root/jaas

Makefile

@@ -1,9 +1,18 @@
+.PHONY: all linux darwin docker
 
-linux:
-	CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-s -w" -installsuffix cgo -o ./jaas
+Version := $(shell git describe --tags --dirty)
+GitCommit := $(shell git rev-parse HEAD)
+LDFLAGS := "-s -w -X main.Version=$(Version) -X main.GitCommit=$(GitCommit)"
+all: darwin linux
+
+LDFLAGS := "-s -w -X main.Version=$(Version) -X main.GitCommit=$(GitCommit)"
 
+linux:
+	CGO_ENABLED=0 GOOS=linux go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/jaas
+linux-armhf:
+	CGO_ENABLED=0 GOOS=linux go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/jaas-armhf
 darwin:
-	CGO_ENABLED=0 GOOS=darwin go build -a -ldflags "-s -w" -installsuffix cgo -o ./jaas
+	CGO_ENABLED=0 GOOS=darwin go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/jaas-darwin
 
 docker:
 	docker build -t alexellis2/jaas:latest .

README.md

@@ -56,7 +56,7 @@ Now test `jaas` with `jaas --help`
 
 * Run your first one-shot container with `jaas run`:
 
-```
+```bash
 # jaas run -r --image alexellis2/cows:latest
 ```
 
@@ -68,24 +68,31 @@ The `-r` flag removes the Swarm service that was used to run your container.
 
 If you aren't interested in the output logs then run it with the `--show-logs=false` override:
 
-```
+```bash
 # jaas run --image alexellis2/cows:latest --show-logs=false
 ```
 
 * Override the command of the container
 
-```
+```bash
 # jaas run --image alpine:3.8 --command "uname -a"
 
 Printing service logs
 w2018-02-06T13:40:00.131678932Z Linux f56d298c4ab9 4.9.75-linuxkit-aufs #1 SMP Tue Jan 9 10:58:17 UTC 2018 x86_64 Linux
 ```
 
+You can also try the example in `examples/gotask`:
+
+
+```bash
+# jaas run -r --image alexellis2/go-task:2020-03-11
+```
+
 * Environment variables
 
 Set environment variables with `--env` or `-e`:
 
-```
+```bash
 # jaas run --image alpine:3.8 --env ENV1=val1 --env ENV2=val2 --command "env"
 
 Service created: inspiring_elion (j90qjtc14usgps9t60tvogmts)
@@ -110,7 +117,7 @@ Removing service...
 
 By default, the service is removed after it completes. To prevent that, run with the `--remove` or `-r` flag set to `false`:
 
-```
+```bash
 # jaas run --image alpine:3.8 --remove=false
 
 Service created: zen_hoover (nwf2zey3i387zkx5gp7yjk053)
@@ -151,7 +158,7 @@ $ jaas run --registry="`echo $auth | base64`" --image my.reg.domain/hello-world:
 
 To give the service access to an _existing secret_. run with the `--secret` or `-s` flag:
 
-```
+```bash
 $ echo -n "S3_ACCESS_KEY_HERE" | docker secret create s3-access-key -
 $ jaas run --image alpine:3.7 --secret s3-access-key --command "cat /run/secrets/s3-access-key"
 
@@ -211,6 +218,10 @@ Todo:
 * When task logs are available in the API this will be used instead of service logs.
 * When event streams are released they will prevent the need to poll continually
 
+## Similar tools
+
+* [kjob](https://github.com/stefanprodan/kjob) by Stefan Prodan appears to be a close variation of jaas, but for Kubernetes.
+
 ## Contributions are welcome
 
 See the [contributing guide](CONTRIBUTING.md) and do not raise a PR unless you've read it all.

examples/gotask/.gitignore

@@ -0,0 +1 @@
+/gotask

examples/gotask/Dockerfile

@@ -0,0 +1,20 @@
+FROM golang:1.13 as build
+
+ENV GO111MODULE=off
+ENV CGO_ENABLED=0
+
+LABEL maintainer [email protected]
+
+RUN mkdir -p /go/src/github.com/alexellis/jaas/gotask
+WORKDIR /go/src/github.com/alexellis/jaas/gotask
+
+COPY . .
+
+RUN CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w" -a -installsuffix cgo -o /bin/gotask
+
+FROM alpine:3.11
+
+WORKDIR /root/
+COPY --from=build /bin/gotask /bin/gotask
+
+ENTRYPOINT ["/bin/gotask"]

samples/gotask/README.md examples/gotask/README.md

@@ -1 +1,6 @@
 This task will print out the hostname of the running container and can be used to test JaaS.
+
+```
+docker build -t alexellis2/go-task:2020-03-11 .
+```
+