From 1124a79b782165853225ff89b190966293de2f73 Mon Sep 17 00:00:00 2001
From: Madelen Andersson <madelan@axis.com>
Date: Wed, 4 Sep 2024 16:05:21 +0200
Subject: [PATCH] Refactor tensorflow in Dockerfile

---
 Dockerfile | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d6c2afb..ee016b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@ FROM arm64v8/ubuntu:${UBUNTU_VERSION} AS containerized_aarch64
 FROM arm32v7/ubuntu:${UBUNTU_VERSION} AS containerized_armv7hf
 
 FROM ${REPO}/acap-native-sdk:${VERSION}-${ARCH}-ubuntu${UBUNTU_VERSION} AS acap-native-sdk
-FROM acap-native-sdk AS build
+
+FROM acap-native-sdk AS build_base
 
 ARG ARCH
 ARG TARGETSYSROOT=/opt/axis/acapsdk/sysroots/${ARCH}
@@ -19,6 +20,7 @@ WORKDIR ${TARGETSYSROOT}/usr/lib
 RUN [ -z "$(ls libabsl*.so*)" ] || rm -f libabsl*.so*
 
 # Install openssl (to use instead of boringssl)
+# hadolint ignore=DL3009
 RUN <<EOF
 apt-get update
 apt-get install -y --no-install-recommends \
@@ -30,6 +32,18 @@ apt-get install -y --no-install-recommends \
     openssl
 EOF
 
+FROM build_base AS tensorflow
+
+WORKDIR /opt
+
+# Get TensorFlow and TensorFlow Serving - doing this in parallel saves a little bit of time
+RUN <<EOF
+    git clone -b r2.9 https://github.com/tensorflow/tensorflow.git /opt/tensorflow/tensorflow
+    git clone -b r2.9 https://github.com/tensorflow/serving.git /opt/tensorflow/serving
+EOF
+
+FROM build_base AS testdata
+
 # Install Edge TPU compiler
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN <<EOF
@@ -77,6 +91,11 @@ RUN <<EOF
     rm -rf tmp
 EOF
 
+FROM build_base AS build_grpc
+
+ARG ARCH
+ARG TARGETSYSROOT=/opt/axis/acapsdk/sysroots/${ARCH}
+
 # Switch to build directory
 WORKDIR /opt
 
@@ -108,6 +127,11 @@ RUN <<EOF
     make -j4 install
 EOF
 
+FROM build_grpc AS build_grpc_arm
+
+ARG ARCH
+ARG TARGETSYSROOT=/opt/axis/acapsdk/sysroots/${ARCH}
+
 # return to build dir
 WORKDIR /opt
 # Build for ARM
@@ -151,11 +175,14 @@ RUN <<EOF
         "$SDKTARGETSYSROOT"/usr/include
 EOF
 
-# Get TensorFlow and TensorFlow Serving
-RUN <<EOF
-    git clone -b r2.9 https://github.com/tensorflow/tensorflow.git /opt/tensorflow/tensorflow
-    git clone -b r2.9 https://github.com/tensorflow/serving.git /opt/tensorflow/serving
-EOF
+FROM build_grpc_arm AS build
+
+ARG TEST
+ARG DEBUG
+
+# Get TensorFlow, TensorFlow Serving and testdata that we pulled in paralell
+COPY --from=tensorflow /opt/tensorflow /opt/tensorflow
+COPY --from=testdata /opt/app/testdata /opt/app/testdata
 
 ## Setup build structure
 WORKDIR /opt/app
@@ -172,10 +199,7 @@ RUN patch /opt/app/apis/tensorflow_serving/apis/predict.proto /opt/app/apis/pred
 
 # Building the ACAP application
 
-ARG TEST
-ARG DEBUG
-
-# hadolint ignore=SC2155
+# hadolint ignore=SC2046,SC2155
 RUN <<EOF
     export MANIFEST="manifest-$ARCH.json";
     export EXTRA_FLAGS=$([ "$ARCH" = "aarch64" ] && echo "-D__arm64__" || echo "");