From 9512e91c7a5272eeca21f01e63b1156e804d9923 Mon Sep 17 00:00:00 2001 From: Pascal Bourque Date: Tue, 1 Dec 2020 12:11:02 -0500 Subject: [PATCH 1/7] Added Swift language support --- Dockerfile | 15 +++++++++++++++ all/entrypoint.sh | 25 ++++++++++++++++++++++++- all/test.sh | 2 +- build.sh | 2 ++ variables.sh | 2 ++ 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b861f269..57e9bf3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ ARG debian=buster ARG go_version +ARG swift_version ARG grpc_version ARG grpc_java_version @@ -95,6 +96,16 @@ RUN curl -sSL https://github.com/grpc/grpc-web/releases/download/${grpc_web_vers -o /tmp/grpc_web_plugin && \ chmod +x /tmp/grpc_web_plugin +FROM swift:$swift_version AS build-swift + +ARG grpc_swift_version + +WORKDIR /tmp +RUN git clone --depth 1 -b $grpc_swift_version https://github.com/grpc/grpc-swift.git + +WORKDIR /tmp/grpc-swift +RUN make plugins + FROM debian:$debian-slim AS protoc-all ARG grpc_version @@ -127,6 +138,10 @@ COPY --from=build /tmp/grpc/bazel-bin/external/com_google_protobuf/ /usr/local/b COPY --from=build /tmp/grpc/bazel-bin/src/compiler/ /usr/local/bin/ # Copy protoc java plugin COPY --from=build /tmp/grpc-java/bazel-bin/compiler/ /usr/local/bin/ +# Copy protoc swift plugin +COPY --from=build-swift /tmp/grpc-swift/protoc-gen-swift /usr/local/bin/ +COPY --from=build-swift /tmp/grpc-swift/protoc-gen-grpc-swift /usr/local/bin/ +COPY --from=build-swift /usr/lib/swift/linux/* /usr/lib/swift/linux/ # Copy grpc_cli COPY --from=build /tmp/grpc/bazel-bin/test/cpp/util/ /usr/local/bin/ diff --git a/all/entrypoint.sh b/all/entrypoint.sh index 539beef1..938b22c2 100755 --- a/all/entrypoint.sh +++ b/all/entrypoint.sh @@ -30,6 +30,8 @@ printUsage() { as surrounding comments." echo " --descr-filename The filename for the descriptor proto when used with -l descriptor_set. Default to descriptor_set.pb" echo " --csharp_opt The options to pass to protoc to customize the csharp code generation." + echo " --swift_opt The options to pass to protoc to customize the swift code generation." + echo " --grpc_swift_opt The options to pass to protoc to customize the swift grpc code generation." echo " --scala_opt The options to pass to protoc to customize the scala code generation." echo " --with-swagger-json-names Use with --with-gateway flag. Generated swagger file will use JSON names instead of protobuf names. (deprecated. Please use --with-openapi-json-names)" @@ -45,7 +47,7 @@ GEN_RBI=false GEN_TYPESCRIPT=false LINT=false LINT_CHECKS="" -SUPPORTED_LANGUAGES=("go" "ruby" "csharp" "java" "python" "objc" "gogo" "php" "node" "web" "cpp" "descriptor_set" "scala") +SUPPORTED_LANGUAGES=("go" "ruby" "csharp" "java" "python" "objc" "swift" "gogo" "php" "node" "web" "cpp" "descriptor_set" "scala") EXTRA_INCLUDES="" OUT_DIR="" GO_SOURCE_RELATIVE="" @@ -57,6 +59,8 @@ DESCR_INCLUDE_IMPORTS=false DESCR_INCLUDE_SOURCE_INFO=false DESCR_FILENAME="descriptor_set.pb" CSHARP_OPT="" +SWIFT_OPT="" +GRPC_SWIFT_OPT="" SCALA_OPT="" OPENAPI_JSON=false @@ -177,6 +181,16 @@ while test $# -gt 0; do CSHARP_OPT=$1 shift ;; + --swift_opt) + shift + SWIFT_OPT=$1 + shift + ;; + --grpc_swift_opt) + shift + GRPC_SWIFT_OPT=$1 + shift + ;; --scala_opt) shift SCALA_OPT=$1 @@ -328,6 +342,15 @@ plugins=grpc+embedded\ GEN_STRING="$GEN_STRING --csharp_opt=$CSHARP_OPT" fi ;; + "swift") + GEN_STRING="--grpc-swift_out=$OUT_DIR --swift_out=$OUT_DIR" + if [[ ! -z $SWIFT_OPT ]]; then + GEN_STRING="$GEN_STRING --swift_opt=$SWIFT_OPT" + fi + if [[ ! -z $GRPC_SWIFT_OPT ]]; then + GEN_STRING="$GEN_STRING --grpc-swift_opt=$GRPC_SWIFT_OPT" + fi + ;; *) GEN_STRING="--grpc_out=$OUT_DIR --${GEN_LANG}_out=$OUT_DIR --plugin=protoc-gen-grpc=`which grpc_${PLUGIN_LANG}_plugin`" ;; diff --git a/all/test.sh b/all/test.sh index 6c62eff4..c258a721 100755 --- a/all/test.sh +++ b/all/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -LANGS=("go" "ruby" "csharp" "java" "python" "objc" "node" "gogo" "php" "cpp" "descriptor_set") +LANGS=("go" "ruby" "csharp" "java" "python" "objc" "swift" "node" "gogo" "php" "cpp" "descriptor_set") CONTAINER=${CONTAINER} diff --git a/build.sh b/build.sh index ddf45e11..f64f8dbe 100755 --- a/build.sh +++ b/build.sh @@ -10,6 +10,8 @@ for build in ${BUILDS[@]}; do --build-arg grpc_version=${GRPC_VERSION} \ --build-arg grpc_java_version=${GRPC_JAVA_VERSION} \ --build-arg grpc_web_version=${GRPC_WEB_VERSION} \ + --build-arg grpc_swift_version=${GRPC_SWIFT_VERSION} \ + --build-arg swift_version=${SWIFT_VERSION} \ --build-arg go_version=${GO_VERSION} \ --target ${build} \ . diff --git a/variables.sh b/variables.sh index b4118305..cb148a34 100755 --- a/variables.sh +++ b/variables.sh @@ -5,6 +5,8 @@ NAMESPACE=${NAMESPACE:-namely} GRPC_VERSION=${GRPC_VERSION:-1.33} GRPC_JAVA_VERSION=${GRPC_JAVA_VERSION:-1.33} GRPC_WEB_VERSION=${GRPC_WEB_VERSION:-1.2.1} +GRPC_SWIFT_VERSION=${GRPC_SWIFT_VERSION:-1.0.0-alpha.21} +SWIFT_VERSION=${SWIFT_VERSION:-5.3.1} GO_VERSION=${GO_VERSION:-1.14} BUILD_VERSION=${BUILD_VERSION:-0} CONTAINER=${DOCKER_REPO}${NAMESPACE} From 9cd5ad04d77026aa4353af7484547484d2c5f362 Mon Sep 17 00:00:00 2001 From: Pascal Bourque Date: Thu, 30 Sep 2021 09:52:56 -0400 Subject: [PATCH 2/7] Updated grpc-swift and swift to latest versions --- variables.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variables.sh b/variables.sh index 22e81d95..bf39fa2d 100755 --- a/variables.sh +++ b/variables.sh @@ -10,8 +10,8 @@ GO_VERSION=${GO_VERSION:-1.14} GRPC_VERSION=${GRPC_VERSION:-1.37} GRPC_JAVA_VERSION=${GRPC_JAVA_VERSION:-1.37} GRPC_WEB_VERSION=${GRPC_WEB_VERSION:-1.2.1} -GRPC_SWIFT_VERSION=${GRPC_SWIFT_VERSION:-1.0.0-alpha.21} -SWIFT_VERSION=${SWIFT_VERSION:-5.3.1} +GRPC_SWIFT_VERSION=${GRPC_SWIFT_VERSION:-1.4.2} +SWIFT_VERSION=${SWIFT_VERSION:-5.5.0} GRPC_GATEWAY_VERSION=${GRPC_GATEWAY_VERSION:-2.0.1} UBER_PROTOTOOL_VERSION=${UBER_PROTOTOOL_VERSION:-1.3.0} SCALA_PB_VERSION=${SCALA_PB_VERSION:-0.11.0} From 1179aff11ba51e5720a9c89dab7ea2d1c6f32698 Mon Sep 17 00:00:00 2001 From: Pascal Bourque Date: Thu, 30 Sep 2021 12:33:00 -0400 Subject: [PATCH 3/7] 'go get' -> 'go install' --- Dockerfile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94cf9da9..87268d39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,41 +67,41 @@ RUN curl -sSL https://github.com/uber/prototool/releases/download/v${uber_protot # https://grpc.io/docs/languages/go/quickstart/#regenerate-grpc-code RUN ( cd ./grpc-go/cmd/protoc-gen-go-grpc && go install . ) -# Go get go-related bins +# go install go-related bins WORKDIR /tmp -RUN go get -u google.golang.org/grpc +RUN go install -u google.golang.org/grpc # install protoc-gen-grpc-gateway and protoc-gen-openapiv2 RUN set -e && \ - GO111MODULE=on go get -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${grpc_gateway_version} && \ + GO111MODULE=on go install -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${grpc_gateway_version} && \ cd /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-grpc-gateway && \ go install . RUN set -e && \ - GO111MODULE=on go get -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${grpc_gateway_version} && \ + GO111MODULE=on go install -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${grpc_gateway_version} && \ cd /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-openapiv2 && \ go install . -RUN go get -u github.com/gogo/protobuf/protoc-gen-gogo -RUN go get -u github.com/gogo/protobuf/protoc-gen-gogofast +RUN go install -u github.com/gogo/protobuf/protoc-gen-gogo +RUN go install -u github.com/gogo/protobuf/protoc-gen-gogofast -RUN go get -u github.com/ckaznocha/protoc-gen-lint -RUN go get -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc +RUN go install -u github.com/ckaznocha/protoc-gen-lint +RUN go install -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc -RUN go get -u github.com/micro/micro/cmd/protoc-gen-micro +RUN go install -u github.com/micro/micro/cmd/protoc-gen-micro -RUN go get -d github.com/envoyproxy/protoc-gen-validate +RUN go install -d github.com/envoyproxy/protoc-gen-validate RUN make -C /go/src/github.com/envoyproxy/protoc-gen-validate/ build -RUN go get -u github.com/mwitkow/go-proto-validators/protoc-gen-govalidators +RUN go install -u github.com/mwitkow/go-proto-validators/protoc-gen-govalidators # Add Ruby Sorbet types support (rbi) -RUN go get -u github.com/coinbase/protoc-gen-rbi +RUN go install -u github.com/coinbase/protoc-gen-rbi -RUN go get github.com/gomatic/renderizer/cmd/renderizer +RUN go install github.com/gomatic/renderizer/cmd/renderizer # Origin protoc-gen-go should be installed last, for not been overwritten by any other binaries(see #210) -RUN go get -u github.com/golang/protobuf/protoc-gen-go +RUN go install -u github.com/golang/protobuf/protoc-gen-go # Add scala support RUN curl -LO https://github.com/scalapb/ScalaPB/releases/download/v${scala_pb_version}/protoc-gen-scala-${scala_pb_version}-linux-x86_64.zip \ From b5f8f0c61be11a422e79b9409590324a84c99d6b Mon Sep 17 00:00:00 2001 From: Pascal Bourque Date: Thu, 30 Sep 2021 13:09:16 -0400 Subject: [PATCH 4/7] Removed '-u' flag for 'go install' --- Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 87268d39..9f4a0377 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,39 +69,39 @@ RUN ( cd ./grpc-go/cmd/protoc-gen-go-grpc && go install . ) # go install go-related bins WORKDIR /tmp -RUN go install -u google.golang.org/grpc +RUN go install google.golang.org/grpc # install protoc-gen-grpc-gateway and protoc-gen-openapiv2 RUN set -e && \ - GO111MODULE=on go install -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${grpc_gateway_version} && \ + GO111MODULE=on go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${grpc_gateway_version} && \ cd /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-grpc-gateway && \ go install . RUN set -e && \ - GO111MODULE=on go install -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${grpc_gateway_version} && \ + GO111MODULE=on go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${grpc_gateway_version} && \ cd /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-openapiv2 && \ go install . -RUN go install -u github.com/gogo/protobuf/protoc-gen-gogo -RUN go install -u github.com/gogo/protobuf/protoc-gen-gogofast +RUN go install github.com/gogo/protobuf/protoc-gen-gogo +RUN go install github.com/gogo/protobuf/protoc-gen-gogofast -RUN go install -u github.com/ckaznocha/protoc-gen-lint -RUN go install -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc +RUN go install github.com/ckaznocha/protoc-gen-lint +RUN go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc -RUN go install -u github.com/micro/micro/cmd/protoc-gen-micro +RUN go install github.com/micro/micro/cmd/protoc-gen-micro RUN go install -d github.com/envoyproxy/protoc-gen-validate RUN make -C /go/src/github.com/envoyproxy/protoc-gen-validate/ build -RUN go install -u github.com/mwitkow/go-proto-validators/protoc-gen-govalidators +RUN go install github.com/mwitkow/go-proto-validators/protoc-gen-govalidators # Add Ruby Sorbet types support (rbi) -RUN go install -u github.com/coinbase/protoc-gen-rbi +RUN go install github.com/coinbase/protoc-gen-rbi RUN go install github.com/gomatic/renderizer/cmd/renderizer # Origin protoc-gen-go should be installed last, for not been overwritten by any other binaries(see #210) -RUN go install -u github.com/golang/protobuf/protoc-gen-go +RUN go install github.com/golang/protobuf/protoc-gen-go # Add scala support RUN curl -LO https://github.com/scalapb/ScalaPB/releases/download/v${scala_pb_version}/protoc-gen-scala-${scala_pb_version}-linux-x86_64.zip \ From fd165ae33c76efff9ce56bf0c789d7ad43a5b5c3 Mon Sep 17 00:00:00 2001 From: Pascal Bourque Date: Thu, 30 Sep 2021 14:05:00 -0400 Subject: [PATCH 5/7] Revert "Removed '-u' flag for 'go install'" This reverts commit b5f8f0c61be11a422e79b9409590324a84c99d6b. --- Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f4a0377..87268d39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,39 +69,39 @@ RUN ( cd ./grpc-go/cmd/protoc-gen-go-grpc && go install . ) # go install go-related bins WORKDIR /tmp -RUN go install google.golang.org/grpc +RUN go install -u google.golang.org/grpc # install protoc-gen-grpc-gateway and protoc-gen-openapiv2 RUN set -e && \ - GO111MODULE=on go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${grpc_gateway_version} && \ + GO111MODULE=on go install -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${grpc_gateway_version} && \ cd /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-grpc-gateway && \ go install . RUN set -e && \ - GO111MODULE=on go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${grpc_gateway_version} && \ + GO111MODULE=on go install -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${grpc_gateway_version} && \ cd /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-openapiv2 && \ go install . -RUN go install github.com/gogo/protobuf/protoc-gen-gogo -RUN go install github.com/gogo/protobuf/protoc-gen-gogofast +RUN go install -u github.com/gogo/protobuf/protoc-gen-gogo +RUN go install -u github.com/gogo/protobuf/protoc-gen-gogofast -RUN go install github.com/ckaznocha/protoc-gen-lint -RUN go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc +RUN go install -u github.com/ckaznocha/protoc-gen-lint +RUN go install -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc -RUN go install github.com/micro/micro/cmd/protoc-gen-micro +RUN go install -u github.com/micro/micro/cmd/protoc-gen-micro RUN go install -d github.com/envoyproxy/protoc-gen-validate RUN make -C /go/src/github.com/envoyproxy/protoc-gen-validate/ build -RUN go install github.com/mwitkow/go-proto-validators/protoc-gen-govalidators +RUN go install -u github.com/mwitkow/go-proto-validators/protoc-gen-govalidators # Add Ruby Sorbet types support (rbi) -RUN go install github.com/coinbase/protoc-gen-rbi +RUN go install -u github.com/coinbase/protoc-gen-rbi RUN go install github.com/gomatic/renderizer/cmd/renderizer # Origin protoc-gen-go should be installed last, for not been overwritten by any other binaries(see #210) -RUN go install github.com/golang/protobuf/protoc-gen-go +RUN go install -u github.com/golang/protobuf/protoc-gen-go # Add scala support RUN curl -LO https://github.com/scalapb/ScalaPB/releases/download/v${scala_pb_version}/protoc-gen-scala-${scala_pb_version}-linux-x86_64.zip \ From 9c918412f1bbd12bf20fd4ae60393646edfdbe7a Mon Sep 17 00:00:00 2001 From: Pascal Bourque Date: Thu, 30 Sep 2021 14:05:04 -0400 Subject: [PATCH 6/7] Revert "'go get' -> 'go install'" This reverts commit 1179aff11ba51e5720a9c89dab7ea2d1c6f32698. --- Dockerfile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 87268d39..94cf9da9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,41 +67,41 @@ RUN curl -sSL https://github.com/uber/prototool/releases/download/v${uber_protot # https://grpc.io/docs/languages/go/quickstart/#regenerate-grpc-code RUN ( cd ./grpc-go/cmd/protoc-gen-go-grpc && go install . ) -# go install go-related bins +# Go get go-related bins WORKDIR /tmp -RUN go install -u google.golang.org/grpc +RUN go get -u google.golang.org/grpc # install protoc-gen-grpc-gateway and protoc-gen-openapiv2 RUN set -e && \ - GO111MODULE=on go install -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${grpc_gateway_version} && \ + GO111MODULE=on go get -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${grpc_gateway_version} && \ cd /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-grpc-gateway && \ go install . RUN set -e && \ - GO111MODULE=on go install -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${grpc_gateway_version} && \ + GO111MODULE=on go get -u github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${grpc_gateway_version} && \ cd /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-openapiv2 && \ go install . -RUN go install -u github.com/gogo/protobuf/protoc-gen-gogo -RUN go install -u github.com/gogo/protobuf/protoc-gen-gogofast +RUN go get -u github.com/gogo/protobuf/protoc-gen-gogo +RUN go get -u github.com/gogo/protobuf/protoc-gen-gogofast -RUN go install -u github.com/ckaznocha/protoc-gen-lint -RUN go install -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc +RUN go get -u github.com/ckaznocha/protoc-gen-lint +RUN go get -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc -RUN go install -u github.com/micro/micro/cmd/protoc-gen-micro +RUN go get -u github.com/micro/micro/cmd/protoc-gen-micro -RUN go install -d github.com/envoyproxy/protoc-gen-validate +RUN go get -d github.com/envoyproxy/protoc-gen-validate RUN make -C /go/src/github.com/envoyproxy/protoc-gen-validate/ build -RUN go install -u github.com/mwitkow/go-proto-validators/protoc-gen-govalidators +RUN go get -u github.com/mwitkow/go-proto-validators/protoc-gen-govalidators # Add Ruby Sorbet types support (rbi) -RUN go install -u github.com/coinbase/protoc-gen-rbi +RUN go get -u github.com/coinbase/protoc-gen-rbi -RUN go install github.com/gomatic/renderizer/cmd/renderizer +RUN go get github.com/gomatic/renderizer/cmd/renderizer # Origin protoc-gen-go should be installed last, for not been overwritten by any other binaries(see #210) -RUN go install -u github.com/golang/protobuf/protoc-gen-go +RUN go get -u github.com/golang/protobuf/protoc-gen-go # Add scala support RUN curl -LO https://github.com/scalapb/ScalaPB/releases/download/v${scala_pb_version}/protoc-gen-scala-${scala_pb_version}-linux-x86_64.zip \ From 804f86fb203194ee609ee5fe248dc72b7724b960 Mon Sep 17 00:00:00 2001 From: Pascal Bourque Date: Thu, 30 Sep 2021 14:21:46 -0400 Subject: [PATCH 7/7] Commented out protoc-gen-validate It was giving a build error --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94cf9da9..cc1836ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,8 +90,8 @@ RUN go get -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc RUN go get -u github.com/micro/micro/cmd/protoc-gen-micro -RUN go get -d github.com/envoyproxy/protoc-gen-validate -RUN make -C /go/src/github.com/envoyproxy/protoc-gen-validate/ build +# RUN go get -d github.com/envoyproxy/protoc-gen-validate +# RUN make -C /go/src/github.com/envoyproxy/protoc-gen-validate/ build RUN go get -u github.com/mwitkow/go-proto-validators/protoc-gen-govalidators @@ -179,7 +179,7 @@ COPY --from=build /tmp/protoc-gen-scala /usr/local/bin/ COPY --from=build /go/pkg/mod/github.com/grpc-ecosystem/grpc-gateway/v2@v${grpc_gateway_version}/protoc-gen-openapiv2/options /opt/include/protoc-gen-openapiv2/options/ -COPY --from=build /go/src/github.com/envoyproxy/protoc-gen-validate/ /opt/include/ +# COPY --from=build /go/src/github.com/envoyproxy/protoc-gen-validate/ /opt/include/ COPY --from=build /go/src/github.com/mwitkow/go-proto-validators/ /opt/include/github.com/mwitkow/go-proto-validators/ ADD all/entrypoint.sh /usr/local/bin