Merge pull request #435 from puneetmatharu/add-radus-changes

Patch build for internal CI

Author: puneetmatharu

ML-Frameworks/pytorch-aarch64/Dockerfile

@@ -4,13 +4,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Specify DOCKER_IMAGE_MIRROR if you want to use a mirror of hub.docker.com
-ARG PYTHON_IMAGE=python:3.12-slim
+ARG BASE_IMAGE=python:3.12-slim
 ARG DOCKER_IMAGE_MIRROR=""
 
 # ============================
 # Workshop
 # ============================
-FROM ${DOCKER_IMAGE_MIRROR}${PYTHON_IMAGE} AS workshop
+FROM ${DOCKER_IMAGE_MIRROR}${BASE_IMAGE} AS workshop
 
 ARG USERNAME
 ARG TORCH_WHEEL
@@ -33,6 +33,7 @@ COPY --chown=$DOCKER_USER:$DOCKER_USER welcome.txt /home/$DOCKER_USER/welcome.tx
 
 # Switch to userland
 USER $DOCKER_USER
+RUN echo "DOCKER_USER=${DOCKER_USER}"
 WORKDIR /home/$DOCKER_USER
 
 # Create virtual environment
@@ -68,7 +69,7 @@ COPY --chown=$DOCKER_USER:$DOCKER_USER pytorch/test /home/$DOCKER_USER/pytorch/t
 # ============================
 # Final flat image
 # ============================
-FROM ${DOCKER_IMAGE_MIRROR}${PYTHON_IMAGE}
+FROM ${DOCKER_IMAGE_MIRROR}${BASE_IMAGE}
 
 ARG USERNAME
 ENV DEBIAN_FRONTEND=noninteractive

ML-Frameworks/pytorch-aarch64/dockerize.sh

@@ -22,14 +22,17 @@ if ! [ -e "$1" ] || ! [ -e "$2" ]; then
     exit 1
 fi
 
+IMAGE_USERNAME="${USERNAME:-$(. /etc/os-release && echo "$ID")}"
+echo "USERNAME=$IMAGE_USERNAME"
+
 docker buildx \
     build --load \
     -t toolsolutions-pytorch:latest  \
     --build-context rootdir=../.. \
     --build-arg DOCKER_IMAGE_MIRROR \
     --build-arg TORCH_WHEEL=$1 \
     --build-arg TORCH_AO_WHEEL=$2 \
-    --build-arg USERNAME=debian \
+    --build-arg USERNAME="$IMAGE_USERNAME" \
     .
 
 [[ $* == *--build-only* ]] && exit 0

ML-Frameworks/utils/git-utils.sh

@@ -57,7 +57,7 @@ function apply-github-patch {
 
     # Approach #1: Try a simple patch application with 'git am'
     _git_with_credentials am --keep-cr "$patch_file" && return 0
-    git am --abort || true # wokeignore:rule=abort/terminate
+    _git_with_credentials am --abort || true # wokeignore:rule=abort/terminate
 
     # Approach #2: Try a three-way merge after fetching the parent commit. It can handle
     # scenarios in which the context of the patch has moved. However, we need the parent
@@ -68,7 +68,7 @@ function apply-github-patch {
     fi
     git fetch --no-tags --quiet --depth=2 "$fetch_url" "$2" || true
     _git_with_credentials am --3way --keep-cr "$patch_file" && return 0
-    git am --abort || true # wokeignore:rule=abort/terminate
+    _git_with_credentials am --abort || true # wokeignore:rule=abort/terminate
 
     # Approach #3: Fall back to GNU 'patch'
     patch -p1 < "$patch_file" || return 1