From 5b7c35cdce9e33c02c70bc6d1e55a99172af0415 Mon Sep 17 00:00:00 2001
From: Mick Stanciu <mick.stanciu@safetyculture.io>
Date: Mon, 16 Sep 2024 15:00:02 +1000
Subject: [PATCH] DEVP-3487 fixed version p2

---
 protoc-go/Dockerfile | 14 +++++++++-----
 protoc-go/build.sh   |  9 +++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/protoc-go/Dockerfile b/protoc-go/Dockerfile
index 81b2c8c..de4f066 100644
--- a/protoc-go/Dockerfile
+++ b/protoc-go/Dockerfile
@@ -1,12 +1,16 @@
 FROM golang:1.18.0-alpine as builder
 
-ENV GRPC_GATEWAY_VERSION 2.20.0
-ENV GOOGLE_PROTOBUF_VERSION 1.34.1
-ENV GOOGLE_PROTOC_GEN_GO_GRPC_VERSION 1.64.0
-ENV PSEUDOMUTO_PROTOC_GEN_DOC_VERSION 1.5.1
-ENV PLANETSCALE_VT_PROTO_VERSION 0.6.0
+
+#ENV GOOGLE_PROTOBUF_VERSION 1.34.1
+#ENV PSEUDOMUTO_PROTOC_GEN_DOC_VERSION 1.5.1
+
 ENV S12_PROTO_VERSION 1.31.0
 
+
+ENV GOOGLE_PROTOC_GEN_GO_GRPC_VERSION 1.4.0
+ENV PLANETSCALE_VT_PROTO_VERSION 0.6.0
+ENV GRPC_GATEWAY_VERSION 2.20.0
+
 # install dependencies and build/install Go
 ADD . /src
 RUN /src/build.sh
diff --git a/protoc-go/build.sh b/protoc-go/build.sh
index 4c718ff..4b1722d 100755
--- a/protoc-go/build.sh
+++ b/protoc-go/build.sh
@@ -2,12 +2,13 @@
 
 set -o errexit
 
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v${GOOGLE_PROTOC_GEN_GO_GRPC_VERSION}
+go install github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto@v${PLANETSCALE_VT_PROTO_VERSION}
 go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${GRPC_GATEWAY_VERSION}
 go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${GRPC_GATEWAY_VERSION}
-go install github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto@v${PSEUDOMUTO_PROTOC_GEN_DOC_VERSION}
-go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v${PSEUDOMUTO_PROTOC_GEN_DOC_VERSION}
-go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v${GOOGLE_PROTOC_GEN_GO_GRPC_VERSION}
-go install google.golang.org/protobuf/cmd/protoc-gen-go@v${GOOGLE_PROTOBUF_VERSION}
+
+#go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v${PSEUDOMUTO_PROTOC_GEN_DOC_VERSION}
+#go install google.golang.org/protobuf/cmd/protoc-gen-go@v${GOOGLE_PROTOBUF_VERSION}
 
 go install github.com/SafetyCulture/protoc-gen-ratelimit/cmd/protoc-gen-ratelimit@latest
 go install github.com/SafetyCulture/protoc-gen-workato/cmd/protoc-gen-workato@latest