1.0.1 release artifacts (#374)

* cleanup usage output

* increment semantic bugfix version

* include all version info on build artifacts

* bump go version for docker builder  image

* remove release badge to eliminate wrap

* add roadmap link to front page

Makefile

@@ -64,9 +64,9 @@ release: build release-artifacts docker docker-release
 
 .PHONY: release-artifacts
 release-artifacts:
-	GOOS=darwin GOARCH=amd64 $(GO) build -o ./OPATH/trickster-$(PROGVER).darwin-amd64 -a -v $(TRICKSTER_MAIN)/main.go && tar cvfz ./OPATH/trickster-$(PROGVER).darwin-amd64.tar.gz ./OPATH/trickster-$(PROGVER).darwin-amd64
-	GOOS=linux  GOARCH=amd64 $(GO) build -o ./OPATH/trickster-$(PROGVER).linux-amd64  -a -v $(TRICKSTER_MAIN)/main.go && tar cvfz ./OPATH/trickster-$(PROGVER).linux-amd64.tar.gz ./OPATH/trickster-$(PROGVER).linux-amd64
-	GOOS=linux  GOARCH=arm64 $(GO) build -o ./OPATH/trickster-$(PROGVER).linux-arm64  -a -v $(TRICKSTER_MAIN)/main.go && tar cvfz ./OPATH/trickster-$(PROGVER).linux-arm64.tar.gz ./OPATH/trickster-$(PROGVER).linux-arm64
+	GOOS=darwin GOARCH=amd64 $(GO) build $(LDFLAGS) -o ./OPATH/trickster-$(PROGVER).darwin-amd64 -a -v $(TRICKSTER_MAIN)/main.go && tar cvfz ./OPATH/trickster-$(PROGVER).darwin-amd64.tar.gz ./OPATH/trickster-$(PROGVER).darwin-amd64
+	GOOS=linux  GOARCH=amd64 $(GO) build $(LDFLAGS) -o ./OPATH/trickster-$(PROGVER).linux-amd64  -a -v $(TRICKSTER_MAIN)/main.go && tar cvfz ./OPATH/trickster-$(PROGVER).linux-amd64.tar.gz ./OPATH/trickster-$(PROGVER).linux-amd64
+	GOOS=linux  GOARCH=arm64 $(GO) build $(LDFLAGS) -o ./OPATH/trickster-$(PROGVER).linux-arm64  -a -v $(TRICKSTER_MAIN)/main.go && tar cvfz ./OPATH/trickster-$(PROGVER).linux-arm64.tar.gz ./OPATH/trickster-$(PROGVER).linux-arm64
 
 # Minikube and helm bootstrapping are done via deploy/helm/Makefile
 .PHONY: helm-local

README.md

@@ -6,13 +6,14 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/Comcast/trickster)](https://goreportcard.com/report/github.com/Comcast/trickster)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2518/badge)](https://bestpractices.coreinfrastructure.org/en/projects/2518)
 [![GoDoc](https://godoc.org/github.com/Comcast/trickster?status.svg)](https://godoc.org/github.com/Comcast/trickster)
-[![Release](https://img.shields.io/github/release/Comcast/trickster.svg)](https://github.com/Comcast/trickster/releases/latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/tricksterio/trickster.svg?maxAge=86400)](https://hub.docker.com/r/tricksterio/trickster)
 
 Trickster is an HTTP reverse proxy/cache for http applications and a dashboard query accelerator for time series databases.
 
 <img src="./docs/images/high-level-1.png" width=512/>
 
+Learn more below, and check out our [roadmap](./docs/roadmap.md) to find out what else is in the works.
+
 ## HTTP Reverse Proxy Cache
 
 Trickster is a fully-featured HTTP Reverse Proxy Cache for HTTP applications like static file servers and web API's.

cmd/trickster/main.go

@@ -44,7 +44,7 @@ var (
 
 const (
 	applicationName    = "trickster"
-	applicationVersion = "1.0.0"
+	applicationVersion = "1.0.1"
 )
 
 // Package main is the main package for the Trickster application
@@ -170,36 +170,45 @@ func printUsage() {
 Trickster Usage:
  
  You must provide -version, -config or both -origin-url and -origin-type.
+
+ Print Version Info:
+ trickster -version
  
- Trickster currently listens on port 9090 by default; Set in a config file,
- or override using -proxy-port.
+ Using a configuration file:
+  trickster -config /path/to/file.conf [-log-level DEBUG|INFO|WARN|ERROR] [-proxy-port 8081] [-metrics-port 8082]
 
- Default log level is INFO. Set in a config file, or override with -log-level.
+ Using origin-url and origin-type:
+  trickster -origin-url https://example.com -origin-type reverseproxycache [-log-level DEBUG|INFO|WARN|ERROR] [-proxy-port 8081] [-metrics-port 8082]
 
- Print Version Info:
-   trickster -version
+------
 
- Simple HTTP Reverse Proxy Cache listening on 8080
+ Simple HTTP Reverse Proxy Cache listening on 8080:
    trickster -origin-url https://example.com/ -origin-type reverseproxycache -proxy-port 8080
 
- Simple Prometheus Accelerator listening on 9090 (default port) with Debugging
+ Simple Prometheus Accelerator listening on 9090 (default port) with Debugging:
    trickster -origin-url http://prometheus.example.com:9090/ -origin-type prometheus -log-level DEBUG
 
- Simple InfluxDB Accelerator listening on 8086
+ Simple InfluxDB Accelerator listening on 8086:
    trickster -origin-url http://influxdb.example.com:8086/ -origin-type influxdb -proxy-port 8086
 
- Simple ClickHouse Accelerator listening on 8123
+ Simple ClickHouse Accelerator listening on 8123:
    trickster -origin-url http://clickhouse.example.com:8123/ -origin-type clickhouse -proxy-port 8123
 
- Using a configuration file:
-   trickster -config /path/to/file.conf [-log-level DEBUG|INFO|WARN|ERROR] [-proxy-port PORT]
+------
+
+Trickster currently listens on port 9090 by default; Set in a config file,
+or override using -proxy-port. The default port will change in a future release.
+
+Default log level is INFO. Set in a config file, or override with -log-level. 
 
 The configuration file is much more robust than the command line arguments, and the example file
 is well-documented. We also have docker images on DockerHub, as well as Kubernetes and Helm
 deployment examples in our GitHub repository.
  
 Thank you for using and contributing to Open Source Software!
 
+https://github.com/Comcast/trickster
+
 `)
 
 }

deploy/Dockerfile

@@ -1,6 +1,6 @@
 ARG IMAGE_ARCH=amd64
 
-FROM golang:1.13.7 as builder
+FROM golang:1.13.8 as builder
 COPY . /go/src/github.com/Comcast/trickster
 WORKDIR /go/src/github.com/Comcast/trickster