From 867d24c3e19bd0fa3283e1fae69f03a2cf1f032f Mon Sep 17 00:00:00 2001 From: Adam Veldhousen Date: Tue, 19 Nov 2019 11:34:52 -0600 Subject: [PATCH] Squashed commit of the following: commit bb652bd350e5c113354cf540e327736081357e7d Author: Adam Veldhousen Date: Tue Nov 19 10:48:17 2019 -0600 added release tagging tasks to make commit faabbebaf97ddc8bdb7f802da667a2abffd69629 Author: Adam Veldhousen Date: Tue Nov 19 10:30:20 2019 -0600 updates for docs --- Dockerfile | 2 +- README.md | 14 +++++++++++--- main.go | 2 +- makefile | 8 ++++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a27e67d..4dfa09a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.3-alpine AS build +FROM golang:1.13.4-alpine AS build WORKDIR /go/src/riffraff COPY . /go/src/riffraff diff --git a/README.md b/README.md index b1c8ae2..41d3f2f 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,19 @@ -# rifraf +# riffraff + +[![GoDoc](https://godoc.org/git.vdhsn.com/adam/riffraff?status.svg)](http://godoc.org/git.vdhsn.com/adam/riffraff) +[![Go Report Card](https://goreportcard.com/badge/git.vdhsn.com/adam/riffraff)](https://goreportcard.com/report/git.vdhsn.com/adam/riffraff) +![Docker Pulls](https://img.shields.io/docker/pulls/vdhsn/riffraff?style=flat-square) +![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/adamveld12/riffraff?style=flat-square) +[![Gocover](http://gocover.io/_badge/github.com/adamveld12/riffraff)](http://gocover.io/github.com/adamveld12/riffraff) +[![Go Walker](http://gowalker.org/api/v1/badge)](https://gowalker.org/github.com/adamveld12/riffraff) +[![Build Status](https://semaphoreci.com/api/v1/adamveld12/riffraff/branches/master/badge.svg)](https://semaphoreci.com/adamveld12/riffraff) + A browser omni search bar enhancer. Side effects may include enhanced productivity, happiness and less google search tracking. ## How to install - - Install it: ``` go get git.vdhsn.com/adam/riffraff @@ -13,7 +21,7 @@ go get git.vdhsn.com/adam/riffraff - Start it: ``` -rifiraff [-p 80] [-accesslog] +rifiraff [-bind 127.0.0.1] [-p 80] [-accesslog] [-data ./data.json] ``` - Point your browser at it: diff --git a/main.go b/main.go index 98ad029..4c32bd1 100644 --- a/main.go +++ b/main.go @@ -12,7 +12,7 @@ import ( func main() { port := flag.Int("port", 80, "port to listen on") - bindAddr := flag.String("bind", "0.0.0.0", "interface to bind to") + bindAddr := flag.String("bind", "127.0.0.1", "interface to bind to") dbPath := flag.String("data", "./data.json", "path to save shortcut database") enableAccessLogging := flag.Bool("accesslog", true, "Enable access logging") flag.Parse() diff --git a/makefile b/makefile index edaa973..44c3915 100644 --- a/makefile +++ b/makefile @@ -7,7 +7,7 @@ BINARY := $(OUTDIR)/$(app) GIT_SHA := $$(git rev-parse HEAD) GIT_BRANCH := $$(git rev-parse --abbrev-ref HEAD) -VERSION := $(git desribe) +VERSION := $$(git describe) define SHORTCUT_DATA @@ -48,6 +48,10 @@ publish: package docker push vdhsn/$(APP):$(VERSION) docker push vdhsn/$(APP):$(GIT_BRANCH) +tag: + git tag --merged refs/head/master + git tag -ase $${TAG} + build: $(BINARY) $(OUTDIR): @@ -71,4 +75,4 @@ data.json: packr: go get -u github.com/gobuffalo/packr/packr -.PHONY: build clean clobber dev lint package package-run publish packr test +.PHONY: build clean clobber dev lint package package-run publish packr tag test