fix arm build

Author: everesio

.github/workflows/release.yaml

@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get git describe
         id: get-version
         run: |
           describe=$(git describe --tags --always --dirty)
           echo "GIT_COMMIT_REF_NAME=$describe" >> $GITHUB_ENV
       - name: Setup go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: '1.23'
           check-latest: true
@@ -29,7 +29,7 @@ jobs:
         run: make clean build test clean
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             grepplabs/kafka-proxy
@@ -42,7 +42,7 @@ jobs:
             type=sha
       - name: Docker meta - all
         id: meta-all
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             grepplabs/kafka-proxy
@@ -56,16 +56,16 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Docker build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -74,7 +74,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: VERSION=${{ env.GIT_COMMIT_REF_NAME }}
       - name: Docker build and push - all
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -84,10 +84,10 @@ jobs:
           labels: ${{ steps.meta-all.outputs.labels }}
           build-args: VERSION=${{ env.GIT_COMMIT_REF_NAME }}
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          version: latest
+          version: '~> v2'
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,40 +1,29 @@
-FROM --platform=$BUILDPLATFORM golang:1.23-alpine3.21 AS builder
-RUN apk add alpine-sdk ca-certificates
+FROM golang:1.23-alpine3.21 AS builder
+
+RUN apk add --no-cache alpine-sdk ca-certificates
 
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
 ARG VERSION
 
 ENV CGO_ENABLED=0 \
     GO111MODULE=on \
-    GOOS=${TARGETOS} \
-    GOARCH=${TARGETARCH} \
-    GOARM=${TARGETVARIANT} \
     LDFLAGS="-X github.com/grepplabs/kafka-proxy/config.Version=${VERSION} -w -s"
 
 WORKDIR /go/src/github.com/grepplabs/kafka-proxy
 COPY . .
 
 RUN mkdir -p build && \
-    export GOARM=$( echo "${GOARM}" | cut -c2-) && \
-    go build -mod=vendor -o build/kafka-proxy \
-    -ldflags "${LDFLAGS}" .
-
-FROM --platform=$BUILDPLATFORM alpine:3.21
-RUN apk add --no-cache ca-certificates libcap
-RUN adduser \
-        --disabled-password \
-        --gecos "" \
-        --home "/nonexistent" \
-        --shell "/sbin/nologin" \
-        --no-create-home \
-        kafka-proxy
+    go build -mod=vendor -o build/kafka-proxy -ldflags "${LDFLAGS}" .
+
+FROM alpine:3.21
+
+RUN apk add --no-cache ca-certificates libcap && \
+    adduser --disabled-password --gecos "" \
+            --home "/nonexistent" --shell "/sbin/nologin" \
+            --no-create-home kafka-proxy
 
 COPY --from=builder /go/src/github.com/grepplabs/kafka-proxy/build /opt/kafka-proxy/bin
 RUN setcap 'cap_net_bind_service=+ep' /opt/kafka-proxy/bin/kafka-proxy
 
 USER kafka-proxy
 ENTRYPOINT ["/opt/kafka-proxy/bin/kafka-proxy"]
 CMD ["--help"]
-

Dockerfile.all

@@ -1,23 +1,16 @@
-FROM --platform=$BUILDPLATFORM golang:1.23-alpine3.21 AS builder
+FROM golang:1.23-alpine3.21 AS builder
 RUN apk add alpine-sdk ca-certificates
 
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
 ARG VERSION
 
 ENV CGO_ENABLED=0 \
     GO111MODULE=on \
-    GOOS=${TARGETOS} \
-    GOARCH=${TARGETARCH} \
-    GOARM=${TARGETVARIANT} \
     LDFLAGS="-X github.com/grepplabs/kafka-proxy/config.Version=${VERSION} -w -s"
 
 WORKDIR /go/src/github.com/grepplabs/kafka-proxy
 COPY . .
 
 RUN mkdir -p build && \
-    export GOARM=$( echo "${GOARM}" | cut -c2-) && \
     go build -mod=vendor -o build/kafka-proxy -ldflags "${LDFLAGS}" . && \
     go build -mod=vendor -o build/auth-user -ldflags "${LDFLAGS}" cmd/plugin-auth-user/main.go && \
     go build -mod=vendor -o build/auth-ldap -ldflags "${LDFLAGS}" cmd/plugin-auth-ldap/main.go && \
@@ -27,7 +20,7 @@ RUN mkdir -p build && \
     go build -mod=vendor -o build/unsecured-jwt-provider -ldflags "${LDFLAGS}" cmd/plugin-unsecured-jwt-provider/main.go && \
     go build -mod=vendor -o build/oidc-provider -ldflags "${LDFLAGS}" cmd/plugin-oidc-provider/main.go
 
-FROM --platform=$BUILDPLATFORM alpine:3.21
+FROM alpine:3.21
 RUN apk add --no-cache ca-certificates libcap
 RUN adduser \
         --disabled-password \

Makefile

@@ -10,11 +10,7 @@ VERSION       ?= $(shell git describe --tags --always --dirty)
 GOPKGS         = $(shell go list ./... | grep -v /vendor/)
 BUILD_FLAGS   ?=
 LDFLAGS       ?= -X github.com/grepplabs/kafka-proxy/config.Version=$(VERSION) -w -s
-TAG           ?= "v0.4.2"
-GOOS          ?= $(if $(TARGETOS),$(TARGETOS),linux)
-GOARCH        ?= $(if $(TARGETARCH),$(TARGETARCH),amd64)
-GOARM         ?= $(TARGETVARIANT)
-BUILDPLATFORM ?= $(GOOS)/$(GOARCH)
+TAG           ?= "v0.4.3"
 
 PROTOC_GO_VERSION ?= v1.33
 PROTOC_GRPC_VERSION ?= v1.2
@@ -51,10 +47,13 @@ build: build/$(BINARY)
 
 .PHONY: build/$(BINARY)
 build/$(BINARY): $(SOURCES)
-	GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) CGO_ENABLED=0 go build -mod=vendor -o build/$(BINARY) $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" .
+	CGO_ENABLED=0 go build -mod=vendor -o build/$(BINARY) $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" .
 
 docker.build:
-	docker buildx build --build-arg BUILDPLATFORM=$(BUILDPLATFORM) --build-arg TARGETARCH=$(GOARCH) -t local/kafka-proxy .
+	docker build --build-arg VERSION=$(VERSION) -t local/kafka-proxy .
+
+docker.build.all:
+	docker build --build-arg VERSION=$(VERSION) -t local/kafka-proxy -f Dockerfile.all .
 
 tag:
 	git tag $(TAG)

README.md

@@ -49,11 +49,11 @@ As not every Kafka release adds new messages/versions which are relevant to the
 
    Linux
 
-        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.4.2/kafka-proxy-v0.4.2-linux-amd64.tar.gz | tar xz
+        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.4.3/kafka-proxy-v0.4.3-linux-amd64.tar.gz | tar xz
 
    macOS
 
-        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.4.2/kafka-proxy-v0.4.2-darwin-amd64.tar.gz | tar xz
+        curl -Ls https://github.com/grepplabs/kafka-proxy/releases/download/v0.4.3/kafka-proxy-v0.4.3-darwin-amd64.tar.gz | tar xz
 
 2. Move the binary in to your PATH.
 
@@ -71,7 +71,7 @@ Docker images are available on [Docker Hub](https://hub.docker.com/r/grepplabs/k
 
 You can launch a kafka-proxy container for trying it out with
 
-    docker run --rm -p 30001-30003:30001-30003 grepplabs/kafka-proxy:0.4.2 \
+    docker run --rm -p 30001-30003:30001-30003 grepplabs/kafka-proxy:0.4.3 \
               server \
             --bootstrap-server-mapping "localhost:19092,0.0.0.0:30001" \
             --bootstrap-server-mapping "localhost:29092,0.0.0.0:30002" \
@@ -90,7 +90,7 @@ Docker images with precompiled plugins located in `/opt/kafka-proxy/bin/` are ta
 
 You can launch a kafka-proxy container with auth-ldap plugin for trying it out with
 
-    docker run --rm -p 30001-30003:30001-30003 grepplabs/kafka-proxy:0.4.2-all \
+    docker run --rm -p 30001-30003:30001-30003 grepplabs/kafka-proxy:0.4.3-all \
                   server \
                 --bootstrap-server-mapping "localhost:19092,0.0.0.0:30001" \
                 --bootstrap-server-mapping "localhost:29092,0.0.0.0:30002" \

cmd/kafka-proxy/server.go

@@ -3,6 +3,7 @@ package server
 import (
 	"fmt"
 	"log/slog"
+	"runtime"
 
 	"github.com/grepplabs/kafka-proxy/config"
 	"github.com/grepplabs/kafka-proxy/proxy"
@@ -224,7 +225,7 @@ func initFlags() {
 }
 
 func Run(_ *cobra.Command, _ []string) {
-	logrus.Infof("Starting kafka-proxy version %s", config.Version)
+	logrus.Infof("Starting kafka-proxy version %s on platform %s/%s", config.Version, runtime.GOOS, runtime.GOARCH)
 
 	var localPasswordAuthenticator apis.PasswordAuthenticator
 	var localTokenAuthenticator apis.TokenInfo

go.mod

@@ -1,7 +1,6 @@
 module github.com/grepplabs/kafka-proxy
 
 go 1.23
-toolchain go1.24.1
 
 require (
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5

proxy/tls_test.go

@@ -119,7 +119,10 @@ func TestTLSUnknownAuthorityNoCAChainCert(t *testing.T) {
 	c.Proxy.TLS.ListenerKeyFile = bundle.ServerKey.Name()
 
 	_, _, _, err := makeTLSPipe(c, nil)
-	a.EqualError(err, "tls: failed to verify certificate: x509: certificate signed by unknown authority")
+	// Can be
+	// - tls: failed to verify certificate: x509: “localhost” certificate is not standards compliant
+	// - tls: failed to verify certificate: x509: certificate signed by unknown authority
+	a.ErrorContains(err, "tls: failed to verify certificate: x509:")
 }
 
 func TestTLSUnknownAuthorityWrongCAChainCert(t *testing.T) {