Skip to content

Commit fa81cd3

Browse files
Fix docker image build using versioned dependencies (#38)
* Fix typo in example command * Update Dockerfile to use pinned versions
1 parent 3d59b34 commit fa81cd3

File tree

4 files changed

+49
-61
lines changed

4 files changed

+49
-61
lines changed

Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
FROM quay.io/prometheus/golang-builder:1.14.2-main as builder
2-
1+
FROM golang:alpine3.15 as builder
32
ADD . /go/src/github.com/m-lab/prometheus-bigquery-exporter
43
WORKDIR /go/src/github.com/m-lab/prometheus-bigquery-exporter
4+
RUN apk add gcc libc-dev git
5+
RUN go vet && \
6+
go get -t . && \
7+
go install .
58

6-
RUN make
7-
8-
FROM quay.io/prometheus/busybox:glibc
9-
9+
FROM alpine:3.15
1010
COPY --from=builder /go/bin/prometheus-bigquery-exporter /bin/prometheus-bigquery-exporter
11-
1211
EXPOSE 9348
13-
1412
ENTRYPOINT [ "/bin/prometheus-bigquery-exporter" ]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@ Use the following steps:
136136
docker run -p 9348:9348 --rm \
137137
-v $HOME/.config/gcloud:/root/.config/gcloud \
138138
-v $PWD:/queries -it bqx-local \
139-
-project $GCLOUD_PROJECT \
140-
-guage-query /queries/example/config/bq_example.sql
139+
-project=$GCLOUD_PROJECT \
140+
-gauge-query=/queries/example/config/bq_example.sql
141141
```

go.mod

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,43 @@
11
module github.com/m-lab/prometheus-bigquery-exporter
22

3-
go 1.14
3+
go 1.18
44

55
require (
66
cloud.google.com/go/bigquery v1.3.0
7-
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
8-
github.com/golang/protobuf v1.4.1 // indirect
9-
github.com/google/go-github/v25 v25.1.3 // indirect
107
github.com/googleapis/google-cloud-go-testing v0.0.0-20191008195207-8e1d251e947d
118
github.com/m-lab/go v1.4.0
12-
github.com/pkg/errors v0.9.1 // indirect
139
github.com/prometheus/client_golang v1.6.0
14-
github.com/prometheus/common v0.10.0 // indirect
15-
github.com/prometheus/promu v0.5.0 // indirect
1610
github.com/spf13/afero v1.2.2
1711
golang.org/x/net v0.0.0-20200513185701-a91f0712d120
12+
google.golang.org/api v0.15.0
13+
)
14+
15+
require (
16+
cloud.google.com/go v0.50.0 // indirect
17+
github.com/BurntSushi/toml v0.3.1 // indirect
18+
github.com/araddon/dateparse v0.0.0-20190622164848-0fb0a474d195 // indirect
19+
github.com/beorn7/perks v1.0.1 // indirect
20+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
21+
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
22+
github.com/golang/protobuf v1.4.1 // indirect
23+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
24+
github.com/jstemmer/go-junit-report v0.9.1 // indirect
25+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
26+
github.com/prometheus/client_model v0.2.0 // indirect
27+
github.com/prometheus/common v0.10.0 // indirect
28+
github.com/prometheus/procfs v0.0.11 // indirect
29+
github.com/prometheus/prometheus v2.5.0+incompatible // indirect
30+
go.opencensus.io v0.22.2 // indirect
31+
golang.org/x/exp v0.0.0-20191227195350-da58074b4299 // indirect
32+
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
1833
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
1934
golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c // indirect
20-
google.golang.org/api v0.15.0
35+
golang.org/x/text v0.3.2 // indirect
36+
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4 // indirect
2137
google.golang.org/appengine v1.6.6 // indirect
38+
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb // indirect
39+
google.golang.org/grpc v1.26.0 // indirect
40+
google.golang.org/protobuf v1.22.0 // indirect
2241
gopkg.in/yaml.v2 v2.3.0 // indirect
42+
honnef.co/go/tools v0.0.1-2019.2.3 // indirect
2343
)

0 commit comments

Comments
 (0)