Merge pull request #29 from lunemec/upgrades_and_fixes

Upgraded various dependency/tool versions & fixed build

.gitignore

@@ -27,3 +27,4 @@ debian/nanny.postrm.debhelper
 debian/nanny.prerm.debhelper
 main
 nanny
+.idea*

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.10-alpine AS build
+FROM docker.io/library/golang:1.15.8-alpine AS build
 
 LABEL maintainer="Philip Schmid (@PhilipSchmid)"
 
@@ -7,7 +7,7 @@ COPY ./ /go/src/nanny
 WORKDIR /go/src/nanny
 RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -tags netgo -ldflags '-w -extldflags "-static"' -o /nanny .
 
-FROM alpine:3.8
+FROM docker.io/library/alpine:3.13
 
 RUN adduser -s /sbin/nologin -H -u 1000 -D nanny
 RUN mkdir -p /opt

Makefile

@@ -25,6 +25,10 @@ docker:
 	docker build -t nanny:$(VERSION) .
 	docker tag nanny:$(VERSION) nanny:latest
 
+buildah:
+	buildah bud -t docker.io/library/nanny:$(VERSION) .
+	buildah tag docker.io/library/nanny:$(VERSION) docker.io/library/nanny:latest
+
 package: clean build
 	scripts/package.sh
 

README.md

@@ -189,7 +189,7 @@ By default, nanny logs only errors. To enable more verbose logging, use `LOGXI=*
 You can add extra meta-data to the API calls, which will be passed to all the notifiers. Metadata must conform to type `map[string]string`.
 
 ```bash
-curl http://localhost:8080/api/v1/signal --data '{ "name": "my program", "notifier": "stderr", "next_signal": "5"s "meta":{"custom": "metadata"} }'
+curl http://localhost:8080/api/v1/signal --data '{ "name": "my program", "notifier": "stderr", "next_signal": "5s", "meta":{"custom": "metadata"} }'
 ```
 
 These metadata will be displayed in the messages for stderr and email, and in tags for sentry.
@@ -201,6 +201,8 @@ Contributions welcome! Just be sure you run tests and lints.
 $ make
   Build
 make build                            Build production binary.
+make docker                           Build a Nanny Docker conainer using Docker
+make buildah                          Build a Nanny Docker conainer using Buildah
   Dev
 make run                              Run Nanny in dev mode, all logging and race detector ON.
 make test                             Run tests.

VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

docker-compose.yml

@@ -1,8 +1,8 @@
-version: "3.6"
+version: "3.8"
 
 services:
   service:
-    image: nanny:latest
+    image: docker.io/library/nanny:latest
     restart: always
     ports:
       - 8080:8080

go.mod

@@ -1,41 +1,40 @@
 module nanny
 
-go 1.12
+go 1.15
 
 require (
-	cloud.google.com/go v0.37.1 // indirect
+	git.apache.org/thrift.git v0.12.0 // indirect
+	github.com/ahmetb/govvv v0.3.0 // indirect
 	github.com/ashwanthkumar/slack-go-webhook v0.0.0-20170722190301-58b9a44feb24
 	github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261 // indirect
 	github.com/cornelk/hashmap v0.0.0-20180619084054-bbc7b3cb4502
-	github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
 	github.com/fsnotify/fsnotify v1.4.7 // indirect
 	github.com/getsentry/raven-go v0.0.0-20180517221441-ed7bcb39ff10
-	github.com/go-sql-driver/mysql v1.4.1 // indirect
-	github.com/go-xorm/builder v0.2.0 // indirect
-	github.com/go-xorm/core v0.6.0 // indirect
-	github.com/go-xorm/xorm v0.7.0
+	github.com/go-xorm/xorm v0.7.9
+	github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 // indirect
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/mux v1.6.2
 	github.com/gorilla/schema v1.0.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.6.2 // indirect
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
-	github.com/lib/pq v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.0 // indirect
 	github.com/mattn/go-colorable v0.0.9 // indirect
 	github.com/mattn/go-isatty v0.0.3 // indirect
-	github.com/mattn/go-sqlite3 v1.9.0
+	github.com/mattn/go-sqlite3 v1.14.0
 	github.com/mattn/go-xmpp v0.0.0-20190124093244-6093f50721ed
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mgutz/logxi v0.0.0-20170321173016-3753102df44e
 	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 // indirect
 	github.com/mitchellh/mapstructure v0.0.0-20180511142126-bb74f1db0675 // indirect
 	github.com/moul/http2curl v0.0.0-20170919181001-9ac6cf4d929b // indirect
+	github.com/nicksnyder/go-i18n v1.10.1 // indirect
 	github.com/parnurzeal/gorequest v0.2.15 // indirect
-	github.com/pelletier/go-toml v1.1.0 // indirect
-	github.com/pkg/errors v0.8.0
+	github.com/pkg/errors v0.8.1
 	github.com/sfreiberg/gotwilio v0.0.0-20180612161623-8fb7259ba8bf
 	github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff // indirect
 	github.com/spf13/afero v1.1.0 // indirect
@@ -44,10 +43,14 @@ require (
 	github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec // indirect
 	github.com/spf13/pflag v1.0.1 // indirect
 	github.com/spf13/viper v1.0.2
-	github.com/stretchr/testify v1.2.2
+	github.com/stretchr/testify v1.4.0
 	github.com/ziutek/mymysql v1.5.4 // indirect
+	golang.org/x/build v0.0.0-20190314133821-5284462c4bec // indirect
 	golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c // indirect
-	google.golang.org/appengine v1.5.0 // indirect
+	gopkg.in/alecthomas/gometalinter.v2 v2.0.12 // indirect
+	gopkg.in/alecthomas/gometalinter.v3 v3.0.0 // indirect
+	gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20191105091915-95d230a53780 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
+	xorm.io/xorm v1.0.7 // indirect
 )