Use actual build process (#80)

* Use actual build process

Signed-off-by: John Seekins <[email protected]>

* Actually add missing files

Signed-off-by: John Seekins <[email protected]>

* fix build pattern

Signed-off-by: John Seekins <[email protected]>

* update deps and fix docker build

Signed-off-by: John Seekins <[email protected]>

* fix dockerfile (pass 2)

Signed-off-by: John Seekins <[email protected]>

* ignore all possible patterns of binary name

Signed-off-by: John Seekins <[email protected]>

* fix up build some more, functioning dockerfile

Signed-off-by: John Seekins <[email protected]>

* bump deps more

Signed-off-by: John Seekins <[email protected]>

Author: johnseekins

.gitignore

@@ -11,4 +11,6 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-/prometheus-kafka-adapter
+prometheus-kafka-adapter-libc
+prometheus-kafka-adapter-musl
+prometheus-kafka-adapter

Dockerfile

@@ -1,17 +1,14 @@
-FROM golang:1.16.3-buster as build
-
+FROM golang:1.17.3-alpine as build
 WORKDIR /src/prometheus-kafka-adapter
 
-COPY go.mod .
-COPY go.sum .
-RUN go mod download
+COPY go.mod go.sum vendor *.go ./
 
 ADD . /src/prometheus-kafka-adapter
 
-RUN go build -o /prometheus-kafka-adapter -ldflags '-w -extldflags "-static"'
-RUN go test ./...
+RUN apk add --no-cache gcc musl-dev
+RUN go build -ldflags='-w -s -extldflags "-static"' -tags musl,static,netgo -mod=vendor -o /prometheus-kafka-adapter
 
-FROM alpine:3.13
+FROM alpine:3.14
 
 COPY schemas/metric.avsc /schemas/metric.avsc
 COPY --from=build /prometheus-kafka-adapter /

Makefile

@@ -0,0 +1,31 @@
+NAME := prometheus-kafka-adapter
+PACKAGE_NAME := github.com/Telefonica/prometheus-kafka-adapter
+GO_VER := 1.17.5
+LIBC_GO_VER := $(GO_VER)-buster
+MUSL_GO_VER := $(GO_VER)-alpine
+
+all: fmt test build
+
+fmt:
+	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) gofmt -l -w -s *.go
+
+test:
+	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) sh tools/testscript.sh vet
+	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) sh tools/testscript.sh test
+
+build: build-libc build-musl
+
+build-libc:
+	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(LIBC_GO_VER) sh tools/buildscript.sh $(NAME)
+
+build-musl:
+	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) sh tools/buildscript.sh $(NAME)
+
+vendor-update:
+	rm -rf go.mod go.sum vendor/
+	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) go mod init $(PACKAGE_NAME)
+	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) go mod tidy
+	docker run --rm -v $(CURDIR):/app:z -w /app golang:$(MUSL_GO_VER) apk add --no-cache gcc musl-dev && go mod vendor
+
+clean:
+	rm -f $(NAME)-libc $(NAME)-musl

README.md

@@ -78,10 +78,13 @@ When deployed in a Kubernetes cluster using Helm and using an external Prometheu
 
 ## development
 
-```
-go test
-go build
-```
+The provided Makefile can do basic linting/building for you simply:
+
+* `make fmt` -> basic formatting.
+* `make test` -> runs `go test` fixtures
+* `make vet` -> runs `go vet` against the package
+* `make vendor-update` -> ensure dependencies are up to date
+* `make` -> builds libc and musl based binaries, including testing and vetting code
 
 ## contributing
 

go.mod

@@ -1,29 +1,49 @@
 module github.com/Telefonica/prometheus-kafka-adapter
 
+go 1.17
+
 require (
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/confluentinc/confluent-kafka-go v1.6.1
-	github.com/gin-gonic/contrib v0.0.0-20191209060500-d6e26eeaa607
-	github.com/gin-gonic/gin v1.6.3
-	github.com/gogo/protobuf v1.3.1
-	github.com/golang/snappy v0.0.1
-	github.com/grpc-ecosystem/grpc-gateway v1.5.0 // indirect
+	github.com/confluentinc/confluent-kafka-go v1.8.2
+	github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19
+	github.com/gin-gonic/gin v1.7.7
+	github.com/gogo/protobuf v1.3.2
+	github.com/golang/snappy v0.0.4
 	github.com/linkedin/goavro v2.1.0+incompatible
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/prometheus/client_golang v0.8.0
+	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e
-	github.com/prometheus/procfs v0.1.3 // indirect
-	github.com/prometheus/prometheus v2.4.2+incompatible
-	github.com/sirupsen/logrus v1.6.0
-	github.com/stretchr/testify v1.6.1
-	google.golang.org/genproto v0.0.0-20180928223349-c7e5094acea1 // indirect
-	google.golang.org/grpc v1.15.0 // indirect
-	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
-	gopkg.in/linkedin/goavro.v1 v1.0.5 // indirect
-	gopkg.in/yaml.v2 v2.2.8
+	github.com/prometheus/common v0.32.1
+	github.com/prometheus/prometheus v2.5.0+incompatible
+	github.com/sirupsen/logrus v1.8.1
+	github.com/stretchr/testify v1.7.0
+	gopkg.in/yaml.v2 v2.4.0
 )
 
-go 1.13
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.13.0 // indirect
+	github.com/go-playground/universal-translator v0.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.4.1 // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/leodido/go-urn v1.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/ugorji/go/codec v1.1.7 // indirect
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
+	golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
+	golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
+	google.golang.org/grpc v1.33.1 // indirect
+	google.golang.org/protobuf v1.26.0-rc.1 // indirect
+	gopkg.in/linkedin/goavro.v1 v1.0.5 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+)