From 8d0e9a2671181c890a01494bd233c936db207ab6 Mon Sep 17 00:00:00 2001 From: carla Date: Wed, 15 Dec 2021 09:17:24 +0200 Subject: [PATCH] swapserverrpc: remove unnecessary vars in proto dockerfile --- swapserverrpc/Dockerfile | 7 +------ swapserverrpc/gen_protos.sh | 1 - swapserverrpc/gen_protos_docker.sh | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/swapserverrpc/Dockerfile b/swapserverrpc/Dockerfile index e84d781..1c96778 100644 --- a/swapserverrpc/Dockerfile +++ b/swapserverrpc/Dockerfile @@ -9,18 +9,13 @@ RUN apt-get update && apt-get install -y \ # explicitly provided by parsing the go.mod file. Otherwise we might forget to # update them here if we bump the versions. ARG PROTOBUF_VERSION -ARG GRPC_GATEWAY_VERSION ENV PROTOC_GEN_GO_GRPC_VERSION="v1.1.0" -ENV FALAFEL_VERSION="v0.9.1" RUN cd /tmp \ && export GO111MODULE=on \ && go get google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOBUF_VERSION} \ - && go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@${PROTOC_GEN_GO_GRPC_VERSION} \ - && go get github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@${GRPC_GATEWAY_VERSION} \ - && go get github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@${GRPC_GATEWAY_VERSION} \ - && go get github.com/lightninglabs/falafel@${FALAFEL_VERSION} + && go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@${PROTOC_GEN_GO_GRPC_VERSION} WORKDIR /build diff --git a/swapserverrpc/gen_protos.sh b/swapserverrpc/gen_protos.sh index 715844c..0ce3a8f 100755 --- a/swapserverrpc/gen_protos.sh +++ b/swapserverrpc/gen_protos.sh @@ -9,7 +9,6 @@ function generate() { do protoc -I/usr/local/include -I. -I.. \ --go_out . --go_opt paths=source_relative \ - --go-grpc_out . --go-grpc_opt paths=source_relative \ "${file}" done } diff --git a/swapserverrpc/gen_protos_docker.sh b/swapserverrpc/gen_protos_docker.sh index 05d83e4..f8728ac 100755 --- a/swapserverrpc/gen_protos_docker.sh +++ b/swapserverrpc/gen_protos_docker.sh @@ -6,12 +6,10 @@ set -e DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" PROTOBUF_VERSION=$(go list -f '{{.Version}}' -m google.golang.org/protobuf) -GRPC_GATEWAY_VERSION=$(go list -f '{{.Version}}' -m github.com/grpc-ecosystem/grpc-gateway/v2) echo "Building protobuf compiler docker image..." docker build -t loop-protobuf-builder \ --build-arg PROTOBUF_VERSION="$PROTOBUF_VERSION" \ - --build-arg GRPC_GATEWAY_VERSION="$GRPC_GATEWAY_VERSION" \ . echo "Compiling and formatting *.proto files..."