commit 1f99b66cd5a75975f87dfad85b9b7562335b4638
author Kent Hagerman <khagerma@ciena.com> Tue Mar 10 17:22:11 2020 -0400
committer Kent Hagerman <khagerma@ciena.com> Tue Mar 10 17:23:23 2020 -0400
tree 9f2a3e25cd0650b8391402bd12593ee39aaf76eb
parent 16a18bfad7a810961f06409908f3041e7bff451a

Updated protoc container to include protoc-gen-grpc-gateway and protoc-gen-swagger.

Motivated by VOL-2629

Change-Id: I249a7b075d9c46e75e0d7ab773c6cab79b2fc7bc

docker/protoc.Dockerfile

diff --git a/docker/protoc.Dockerfile b/docker/protoc.Dockerfile
index bce36c1..4edf72c 100644
--- a/docker/protoc.Dockerfile
+++ b/docker/protoc.Dockerfile
@@ -15,13 +15,17 @@
 FROM golang:1.13.8-alpine as build
 
 ARG PROTOC_VERSION
-ARG PROTOC_GEN_GO_VERSION
 ARG PROTOC_SHA256SUM
+ARG PROTOC_GEN_GO_VERSION
+ARG PROTOC_GEN_GRPC_GATEWAY_VERSION
 
 RUN apk add --no-cache libatomic=9.2.0-r3 musl=1.1.24-r0
 
 # download & compile this specific version of protoc-gen-go
-RUN GO111MODULE=on go get -u github.com/golang/protobuf/protoc-gen-go@v$PROTOC_GEN_GO_VERSION
+RUN GO111MODULE=on CGO_ENABLED=0 go get -u \
+    github.com/golang/protobuf/protoc-gen-go@v$PROTOC_GEN_GO_VERSION \
+    github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v$PROTOC_GEN_GRPC_GATEWAY_VERSION \
+    github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v$PROTOC_GEN_GRPC_GATEWAY_VERSION
 
 RUN mkdir -p /tmp/protoc3 && \
     wget -O /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \
@@ -41,7 +45,7 @@
 COPY --from=build /tmp/protoc3/bin/* /usr/local/bin/
 COPY --from=build /tmp/protoc3/include/ /usr/local/include/
 
-# copy protoc-gen-go
+# copy protoc-gen-go, protoc-gen-grpc-gateway, and protoc-gen-swagger
 COPY --from=build /go/bin/* /usr/local/bin/
 
 WORKDIR /app
@@ -55,6 +59,7 @@
 ARG org_opencord_vcs_dirty=unknown
 ARG PROTOC_VERSION=unknown
 ARG PROTOC_GEN_GO_VERSION=unknown
+ARG PROTOC_GEN_GRPC_GATEWAY_VERSION=unknown
 
 LABEL org.label-schema.schema-version=1.0 \
       org.label-schema.name=voltha-protoc \
@@ -65,4 +70,5 @@
       org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
       org.opencord.vcs-dirty=$org_opencord_vcs_dirty \
       org.opencord.protoc-version=$PROTOC_VERSION \
-      org.opencord.protoc-gen-go-version=$PROTOC_GEN_GO_VERSION
+      org.opencord.protoc-gen-go-version=$PROTOC_GEN_GO_VERSION \
+      org.opencord.protoc-gen-grpc-gateway-version=$PROTOC_GEN_GRPC_GATEWAY_VERSION