Upgrade Docker to go 1.15 & don't release as a scratch image

Author: parkr

Dockerfile

@@ -1,13 +1,11 @@
-FROM golang:1.14.3 as builder
+FROM golang:1.15 as builder
 WORKDIR /go/src/github.com/parkr/ping
 EXPOSE 3306
 COPY . .
 RUN go version
-RUN go install github.com/parkr/ping/...
+RUN go install github.com/parkr/ping/... && ls -l /go/bin
 
-FROM scratch
 HEALTHCHECK --start-period=1s --interval=30s --timeout=5s --retries=1 \
-  CMD [ "/bin/ping-healthcheck" ]
-COPY --from=builder /go/bin/ping-healthcheck /bin/ping-healthcheck
-COPY --from=builder /go/bin/ping /bin/ping-server
-ENTRYPOINT [ "/bin/ping-server" ]
+  CMD [ "/go/bin/ping-healthcheck" ]
+
+ENTRYPOINT [ "/go/bin/ping" ]

Makefile

@@ -23,3 +23,6 @@ docker-test: docker-build
 
 docker-release: docker-build
 	docker push parkr/ping:$(REV)
+
+dive: docker-build
+	dive parkr/ping:$(REV)

go.mod

@@ -3,8 +3,7 @@ module github.com/parkr/ping
 go 1.14
 
 require (
-	github.com/jmoiron/sqlx v0.0.0-20170121103519-f980a91bdc37
-	github.com/lib/pq v1.4.0 // indirect
+	github.com/jmoiron/sqlx v1.2.0
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
-	github.com/parkr/gossip v0.0.0-20170207041538-a9ea9f924daf
+	google.golang.org/appengine v1.6.7 // indirect
 )

go.sum

@@ -1,11 +1,18 @@
-github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/jmoiron/sqlx v0.0.0-20170121103519-f980a91bdc37 h1:FZc3adQBtm3UfBaJmQ6PskygMUPuJkjOK8p0z6GEYUE=
-github.com/jmoiron/sqlx v0.0.0-20170121103519-f980a91bdc37/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
-github.com/lib/pq v1.4.0 h1:TmtCFbH+Aw0AixwyttznSMQDgbR5Yed/Gg6S8Funrhc=
-github.com/lib/pq v1.4.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx+opk=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
+github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/parkr/gossip v0.0.0-20170207041538-a9ea9f924daf h1:rUZlwm2L4Px9+c1V7V2Cdddj55NhfOw8kcILdFHt1eQ=
-github.com/parkr/gossip v0.0.0-20170207041538-a9ea9f924daf/go.mod h1:31ZbvXsmmURO02gN4g+bj9pTwBIIdyniEWqzmI4gog4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=

utils.go

@@ -1,13 +1,17 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
-
-	"github.com/parkr/gossip/serializer"
 )
 
-func writeJsonResponse(w http.ResponseWriter, json interface{}) {
+func writeJsonResponse(w http.ResponseWriter, input interface{}) {
 	w.Header().Set("Content-Type", "application/json")
-	fmt.Fprintf(w, serializer.MarshalJson(json))
+	data, err := json.Marshal(input)
+	if err != nil {
+		fmt.Fprintf(w, `{"error":"json, `+err.Error()+`"}`)
+	} else {
+		w.Write(data)
+	}
 }