Smaller docker images and go.mod support (#26)

AeroNotix · web-flow · commit 93a1e5937c9b · 2020-05-14T09:34:38.000-04:00
* Smaller docker images and go.mod support
* Move command to top level directory
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,5 @@
+Dockerfile
+Dockerfile.testing
+prometheus-bigquery-exporter
+README.md
+**/*_test.go
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/prometheus-bigquery-exporter
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-- '1.12'
+- '1.14'
 
 # Unconditionally place the repo at GOPATH/src/${go_import_path} to support
 # forks.
@@ -13,5 +13,6 @@ before_install:
 
 script:
 # Run query "unit tests".
+- make
 - go test -short -v ./... -cover=1 -coverprofile=_c.cov
 - $GOPATH/bin/goveralls -service=travis-ci -coverprofile=_c.cov
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,14 @@
-FROM golang:1.12
+FROM quay.io/prometheus/golang-builder:1.14.2-main as builder
+
 ADD . /go/src/github.com/m-lab/prometheus-bigquery-exporter
-RUN go get -v github.com/m-lab/prometheus-bigquery-exporter/cmd/bigquery_exporter
-ENTRYPOINT ["/go/bin/bigquery_exporter"]
+WORKDIR /go/src/github.com/m-lab/prometheus-bigquery-exporter
+
+RUN make
+
+FROM quay.io/prometheus/busybox:glibc
+
+COPY --from=builder /go/bin/prometheus-bigquery-exporter /bin/prometheus-bigquery-exporter
+
+EXPOSE 9348
+
+ENTRYPOINT  [ "/bin/prometheus-bigquery-exporter" ]
diff --git a/Makefile b/Makefile
@@ -0,0 +1,19 @@
+GO := go
+DOCKER_IMAGE_NAME ?= prometheus-bigquery-exporter
+DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
+
+
+all: vet build
+
+vet:
+	@echo ">> vetting code"
+	@$(GO) vet $(pkgs)
+
+build:
+	@$(GO) get -t .
+
+docker:
+	@echo ">> building docker image"
+	@docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" .
+
+.PHONY: all build docker
diff --git a/go.mod b/go.mod
@@ -0,0 +1,23 @@
+module github.com/m-lab/prometheus-bigquery-exporter
+
+go 1.14
+
+require (
+	cloud.google.com/go/bigquery v1.3.0
+	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
+	github.com/golang/protobuf v1.4.1 // indirect
+	github.com/google/go-github/v25 v25.1.3 // indirect
+	github.com/googleapis/google-cloud-go-testing v0.0.0-20191008195207-8e1d251e947d
+	github.com/m-lab/go v1.4.0
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.6.0
+	github.com/prometheus/common v0.10.0 // indirect
+	github.com/prometheus/promu v0.5.0 // indirect
+	github.com/spf13/afero v1.2.2
+	golang.org/x/net v0.0.0-20200513185701-a91f0712d120
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c // indirect
+	google.golang.org/api v0.15.0
+	google.golang.org/appengine v1.6.6 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
+)
diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
diff --git a/main_test.go b/main_test.go
diff --git a/query/bigquery_runner.go b/query/bigquery_runner.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"cloud.google.com/go/bigquery"
-	"github.com/GoogleCloudPlatform/google-cloud-go-testing/bigquery/bqiface"
+	"github.com/googleapis/google-cloud-go-testing/bigquery/bqiface"
 	"github.com/m-lab/prometheus-bigquery-exporter/sql"
 	"google.golang.org/api/iterator"
 )

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"strings"`
`11`	`11`
`12`	`12`	`"cloud.google.com/go/bigquery"`
`13`		`- "github.com/GoogleCloudPlatform/google-cloud-go-testing/bigquery/bqiface"`
	`13`	`+ "github.com/googleapis/google-cloud-go-testing/bigquery/bqiface"`
`14`	`14`	`"github.com/m-lab/prometheus-bigquery-exporter/sql"`
`15`	`15`	`"google.golang.org/api/iterator"`
`16`	`16`	`)`