Downgrade confluent-kafka-go to v2.0.2 due to confluentinc/confluent-…

…kafka-go#981

Dockerfile

@@ -1,14 +1,17 @@
-FROM golang:1.20-alpine3.16 as builder
+FROM --platform=$BUILDPLATFORM  golang:1.20-alpine3.17 as builder
 
 RUN apk add alpine-sdk ca-certificates
 
+ARG TARGETOS
+ARG TARGETARCH
+
 WORKDIR "/code"
 ADD . "/code"
 
 # https://github.com/confluentinc/confluent-kafka-go: When building your application for Alpine Linux (musl libc) you must pass -tags musl to go get, go build, etc.
-RUN make BINARY=mqtt-proxy BUILD_FLAGS="-tags musl" GOOS=linux GOARCH=amd64 build
+RUN make BINARY=mqtt-proxy BUILD_FLAGS="-tags musl" GOOS=${TARGETOS} GOARCH=${TARGETARCH} build
 
-FROM alpine:3.16
+FROM --platform=$BUILDPLATFORM alpine:3.17
 RUN apk add ca-certificates
 COPY --from=builder /code/mqtt-proxy /mqtt-proxy
 ENTRYPOINT ["/mqtt-proxy"]

Makefile

@@ -16,8 +16,9 @@ LDFLAGS       ?= -w -s \
 				 -X github.com/prometheus/common/version.BuildUser=$$USER \
 				 -X github.com/prometheus/common/version.BuildDate=${BUILD_DATE}
 
-GOARCH        ?= amd64
-GOOS          ?= linux
+GOOS          ?= $(if $(TARGETOS),$(TARGETOS),linux)
+GOARCH        ?= $(if $(TARGETARCH),$(TARGETARCH),amd64)
+BUILDPLATFORM ?= $(GOOS)/$(GOARCH)
 
 LOCAL_IMAGE   ?= local/$(BINARY)
 CLOUD_IMAGE   ?= grepplabs/mqtt-proxy:$(TAG)
@@ -61,11 +62,11 @@ os-build:
 
 .PHONY: docker-build
 docker-build:
-	docker build -f Dockerfile -t $(LOCAL_IMAGE) .
+	docker buildx build --build-arg BUILDPLATFORM=$(BUILDPLATFORM) --build-arg TARGETARCH=$(GOARCH) -f Dockerfile -t $(LOCAL_IMAGE) .
 
 .PHONY: docker-push
 docker-push:
-	docker build -f Dockerfile -t $(LOCAL_IMAGE) .
+	docker buildx build --build-arg BUILDPLATFORM=$(BUILDPLATFORM) --build-arg TARGETARCH=$(GOARCH) -t $(LOCAL_IMAGE) .
 	docker tag $(LOCAL_IMAGE) $(CLOUD_IMAGE)
 	docker push $(CLOUD_IMAGE)
 

cmd/server.go

@@ -23,6 +23,7 @@ import (
 	"github.com/oklog/run"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+	"github.com/prometheus/common/version"
 )
 
 func runServer(
@@ -31,6 +32,7 @@ func runServer(
 	registry *prometheus.Registry,
 	cfg *config.Server,
 ) error {
+	logger.WithField("version", version.Version).WithField("branch", version.Branch).WithField("revision", version.Revision).Infof("starting mqtt-proxy")
 
 	err := cfg.Validate()
 	if err != nil {

go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/alecthomas/kong v0.7.0
 	github.com/alecthomas/kong-yaml v0.1.1
-	github.com/confluentinc/confluent-kafka-go/v2 v2.1.0
+	github.com/confluentinc/confluent-kafka-go/v2 v2.0.2
 	github.com/go-playground/validator/v10 v10.11.1
 	github.com/oklog/run v1.1.0
 	github.com/prometheus/client_golang v1.13.1