commit a13b2c5648d7f90296eb75fddaff9e922db67de3
author Andrea Campanella <andrea@opennetworking.org> Mon Apr 26 11:38:51 2021 +0000
committer David K. Bainbridge <dbainbri@ciena.com> Mon Apr 26 14:20:45 2021 +0000
tree ad0c3687d21bb1a7d380b039eca2fe801329adf4
parent 278fc16dfba78ca3fd23bc7b296d3ed25492d16a

Updating to grpc 1.13.1

- and make value a parameter

Change-Id: Ib1b6cc23aeac98f3c177f81254bc455c16086875

docker/protoc.Dockerfile

diff --git a/docker/protoc.Dockerfile b/docker/protoc.Dockerfile
index 9965969..c60c02d 100644
--- a/docker/protoc.Dockerfile
+++ b/docker/protoc.Dockerfile
@@ -34,19 +34,23 @@
     unzip /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /tmp/protoc3 && \
     chmod -R a+rx /tmp/protoc3/
 
-FROM alpine:3.13 as cpp-build
+ARG GOLANG_VERSION
+FROM golang:$GOLANG_VERSION-alpine3.13 as cpp-build
+
+ARG PROTOC_GEN_CPP_VERSION
 
 # Install required packages
 RUN apk add --no-cache \
     build-base=0.5-r2 \
     git=2.30.2-r0 \
     cmake=3.18.4-r1 \
-    linux-headers=5.7.8-r0
+    linux-headers=5.7.8-r0 \
+    perl=5.32.0-r0
 
 WORKDIR /src
 
 # Clone grpc and submodules
-RUN git clone --recurse-submodules -b v1.31.0 \
+RUN git clone --recurse-submodules -b v${PROTOC_GEN_CPP_VERSION} \
         --depth=1 --shallow-submodules https://github.com/grpc/grpc
 
 # Create and configure make environment