From c11cb9fae5b1e0e573c1c7210a208b9d467deb09 Mon Sep 17 00:00:00 2001
From: Johan Olsson <johanol@axis.com>
Date: Tue, 10 Sep 2024 13:37:19 +0200
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Madelen Andersson <madelen.andersson@axis.com>
---
 Dockerfile.proto | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.proto b/Dockerfile.proto
index 0685efe..5963cfe 100644
--- a/Dockerfile.proto
+++ b/Dockerfile.proto
@@ -20,18 +20,20 @@ RUN <<EOF
     apt-get update && apt-get install -y --no-install-recommends \
         python3 \
         python3-pip \
-        git \
-    && rm -rf /var/lib/apt/lists/*
+        git
+    rm -rf /var/lib/apt/lists/*
 EOF
 
 # grpcio-tools contains protoc, which allows to build the pb2.py files in the install-tf.sh script.
 # Installing directly grpcio-tools result in an older version of protobuf.
-RUN pip install  --no-cache-dir \
+RUN <<EOF
+      pip install --no-cache-dir \
       grpcio==${GRPC_VERSION} \
       protobuf==${PROTOBUF_VERSION} \
       six==${SIX_VERSION}
-RUN pip install --no-dependencies \
+      pip install --no-dependencies \
       grpcio-tools==${GRPCIO_TOOLS_VERSION}
+ EOF
 
 # Build TensorFlow serving proto files
 WORKDIR /build/tf
@@ -65,13 +67,19 @@ COPY apis/wrappers/tf_proto_utils.py ./proto_utils
 #Build vdo proto
 WORKDIR /build/vdo
 COPY apis/videocapture.proto ./
-RUN mkdir ./proto_utils && python3 -m grpc_tools.protoc -I . --python_out=./proto_utils --grpc_python_out=./proto_utils videocapture.proto
+RUN <<EOF
+   mkdir ./proto_utils
+   python3 -m grpc_tools.protoc -I . --python_out=./proto_utils --grpc_python_out=./proto_utils videocapture.proto
+EOF
 COPY apis/wrappers/vdo_proto_utils.py ./proto_utils
 
 # Build keyvalue proto
 WORKDIR /build/param
 COPY apis/keyvaluestore.proto ./
-RUN mkdir ./proto_utils && python3 -m grpc_tools.protoc -I . --python_out=./proto_utils --grpc_python_out=./proto_utils keyvaluestore.proto
+RUN <<EOF
+   mkdir ./proto_utils
+   python3 -m grpc_tools.protoc -I . --python_out=./proto_utils --grpc_python_out=./proto_utils keyvaluestore.proto
+EOF
 
 # Saving required libraries versions into a file
 RUN pip freeze | grep -E '^(grpcio|protobuf|six)==' > /build/requirements.txt