From 0dd85a21a9ee6fc9d7d78ab036bbec2e586cb8ae Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Sun, 20 Nov 2022 16:58:31 +0100
Subject: [PATCH] Fix proto gen

---
 hack/gen.Dockerfile | 31 +++++++++++++------------------
 tools.go            |  8 --------
 tools/tools.go      | 11 +++++++++++
 3 files changed, 24 insertions(+), 26 deletions(-)
 delete mode 100644 tools.go
 create mode 100644 tools/tools.go

diff --git a/hack/gen.Dockerfile b/hack/gen.Dockerfile
index 5cfc1349..3e7caae1 100644
--- a/hack/gen.Dockerfile
+++ b/hack/gen.Dockerfile
@@ -2,25 +2,18 @@
 
 ARG GO_VERSION="1.19"
 ARG PROTOC_VERSION="3.17.3"
-ARG GLIBC_VERSION="2.33-r0"
 
-FROM golang:${GO_VERSION}-alpine AS base
-ARG GLIBC_VERSION
-RUN apk add --no-cache curl file git unzip
-RUN <<EOT
-  set -e
-  curl -sSL "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" -o "/etc/apk/keys/sgerrand.rsa.pub"
-  curl -sSL "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk" -o "glibc.apk"
-  apk add glibc.apk
-  rm /etc/apk/keys/sgerrand.rsa.pub glibc.apk
-EOT
+# protoc is dynamically linked to glibc so can't use alpine base
+FROM golang:${GO_VERSION}-bullseye AS base
+RUN apt-get update && apt-get --no-install-recommends install -y git unzip
 ARG PROTOC_VERSION
+ARG TARGETOS
+ARG TARGETARCH
 RUN <<EOT
   set -e
-  curl -sSL "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip" -o "protoc.zip"
-  unzip "protoc.zip" -d "/usr/local"
-  protoc --version
-  rm "protoc.zip"
+  arch=$(echo $TARGETARCH | sed -e s/amd64/x86_64/ -e s/arm64/aarch_64/)
+  wget -q https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-${TARGETOS}-${arch}.zip
+  unzip protoc-${PROTOC_VERSION}-${TARGETOS}-${arch}.zip -d /usr/local
 EOT
 WORKDIR /src
 
@@ -30,15 +23,17 @@ RUN --mount=type=cache,target=/go/pkg/mod \
   go mod download
 
 FROM vendored AS tools
-RUN --mount=type=bind,target=.,rw \
+RUN --mount=type=bind,target=. \
     --mount=type=cache,target=/go/pkg/mod \
-  go install -v $(sed -n -e 's|^\s*_\s*"\(.*\)".*$|\1| p' tools.go)
+  go install \
+    google.golang.org/grpc/cmd/protoc-gen-go-grpc \
+    google.golang.org/protobuf/cmd/protoc-gen-go
 
 FROM tools AS generate
 RUN --mount=type=bind,target=.,rw \
     --mount=type=cache,target=/go/pkg/mod <<EOT
   set -e
-  go generate ./...
+  go generate -v ./...
   mkdir /out
   cp -Rf pb /out
 EOT
diff --git a/tools.go b/tools.go
deleted file mode 100644
index 07d59d1d..00000000
--- a/tools.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build tools
-
-package tools
-
-import (
-	_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
-	_ "google.golang.org/protobuf/cmd/protoc-gen-go"
-)
diff --git a/tools/tools.go b/tools/tools.go
new file mode 100644
index 00000000..0eb3cb43
--- /dev/null
+++ b/tools/tools.go
@@ -0,0 +1,11 @@
+//go:build tools
+// +build tools
+
+// Package tools tracks dependencies on binaries not referenced in this codebase.
+// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
+package tools
+
+import (
+	_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
+	_ "google.golang.org/protobuf/cmd/protoc-gen-go"
+)