Merge pull request #376 from puneetmatharu/patch-tensorflow-docker-build

Patch tensorflow docker build

Author: nSircombe

ML-Frameworks/pytorch-aarch64/dockerize.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # *******************************************************************************
-# Copyright 2024 Arm Limited and affiliates.
+# Copyright 2025 Arm Limited and affiliates.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

ML-Frameworks/tensorflow-aarch64/Dockerfile

@@ -41,7 +41,7 @@ RUN apt-get install -y protobuf-compiler
 RUN apt-get install -y wget
 
 # DOCKER_USER for the Docker user
-ENV DOCKER_USER=ubuntu
+ENV DOCKER_USER=${USERNAME}
 
 # Setup default user
 RUN useradd --create-home -s /bin/bash -m $DOCKER_USER && echo "$DOCKER_USER:Portland" | chpasswd && adduser $DOCKER_USER sudo
@@ -53,7 +53,7 @@ COPY bash_profile /home/$DOCKER_USER/.bash_profile
 RUN chown $DOCKER_USER:$DOCKER_USER /home/$DOCKER_USER/.bash_profile
 
 # Add welcome message to warn about dev quality
-COPY welcome.txt /home/$DOCKER_USER/.
+COPY welcome.txt /home/$DOCKER_USER/
 RUN echo '[ ! -z "$TERM" -a -r /home/$DOCKER_USER/welcome.txt ] && cat /home/$DOCKER_USER/welcome.txt' >> /etc/bash.bashrc
 RUN echo 'export PATH="$HOME/.local/bin:$PATH"' >>  /etc/bash.bashrc
 
@@ -69,10 +69,8 @@ RUN test -n "$TENSORFLOW_WHEEL"
 COPY $TENSORFLOW_WHEEL /home/$DOCKER_USER/
 
 # Install our dev build of TensorFlow.
-RUN pip install \
-    "$(basename "$TENSORFLOW_WHEEL")" \
-    && rm \
-    "$(basename "$TENSORFLOW_WHEEL")"
+RUN pip install "$(basename "$TENSORFLOW_WHEEL")" \
+    && rm "$(basename "$TENSORFLOW_WHEEL")"
 
 # Base requirements for examples, excluding TensorFlow
 COPY requirements.txt ./

ML-Frameworks/tensorflow-aarch64/dockerize.sh

@@ -37,6 +37,8 @@ docker buildx \
     -t toolsolutions-tensorflow:latest  \
     --build-context rootdir=../.. \
     --build-arg TENSORFLOW_WHEEL=$1 \
+    --build-arg DOCKER_IMAGE_MIRROR \
+    --build-arg USERNAME=ubuntu \
     .
 
 [[ $* == *--build-only* ]] && exit 0