DEVP-3487 fixed version p3

SafetyCulture · Sep 16, 2024 · cd8eca0 · cd8eca0
1 parent 5b7c35c
commit cd8eca0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/protoc-go/Dockerfile b/protoc-go/Dockerfile
@@ -1,15 +1,12 @@
 FROM golang:1.18.0-alpine as builder
 
-
-#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
+ENV PROTOC_GEN_GO_VERSION 1.34.1
+ENV PROTOC_GEN_DOC_VERSION 1.5.1
+ENV PROTOC_GEN_GO_GRPC_VERSION 1.4.0
+ENV PROTOC_GEN_GO_VTPROTO_VERSION 0.6.0
+ENV PROTOC_GEN_GRPC_GATEWAY_VERSION 2.20.0
 
 # install dependencies and build/install Go
 ADD . /src

diff --git a/protoc-go/build.sh b/protoc-go/build.sh
@@ -2,13 +2,15 @@
 
 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 google.golang.org/protobuf/cmd/protoc-gen-go@v${PROTOC_GEN_GO_VERSION}
+go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v${PROTOC_GEN_DOC_VERSION}
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v${PROTOC_GEN_GO_GRPC_VERSION}
+go install github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto@v${PROTOC_GEN_GO_VTPROTO_VERSION}
+go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${PROTOC_GEN_GRPC_GATEWAY_VERSION}
+go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${PROTOC_GEN_GRPC_GATEWAY_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