From ae1b8f021b4a49b61ca7ef8d8c6832a1a36a73ea Mon Sep 17 00:00:00 2001
From: Joaquin Anton Guirao <janton@nvidia.com>
Date: Thu, 16 Jan 2025 15:11:58 +0100
Subject: [PATCH] Minimize changes

Signed-off-by: Joaquin Anton Guirao <janton@nvidia.com>
---
 docker/Dockerfile.build.aarch64-linux | 74 +++++++++++++--------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/docker/Dockerfile.build.aarch64-linux b/docker/Dockerfile.build.aarch64-linux
index a1a0e318ef..ea3aa79797 100644
--- a/docker/Dockerfile.build.aarch64-linux
+++ b/docker/Dockerfile.build.aarch64-linux
@@ -6,49 +6,47 @@ ENV DEBIAN_FRONTEND=noninteractive \
     CUDA_CROSS_VERSION_DOT=12.6
 
 RUN apt-get update && apt-get install -y gnupg ca-certificates wget && \
-    apt-get update && apt-get install software-properties-common -y --no-install-recommends && \
     apt-key del 7fa2af80 && \
-    wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb && \
-    dpkg -i cuda-keyring_1.1-1_all.deb && \
     gpg --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC && \
     gpg --export --armor A4B469963BF863CC | tee /etc/apt/trusted.gpg.d/nvidia.asc && \
+    apt-get update && apt-get install software-properties-common -y --no-install-recommends && \
+    wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb && \
+    dpkg -i cuda-keyring_1.1-1_all.deb && \
     add-apt-repository 'deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/cross-linux-aarch64/ /' -y && \
-    apt update && apt install -y \
-        cuda-cudart-cross-aarch64-${CUDA_CROSS_VERSION} \
-        libcufft-cross-aarch64-${CUDA_CROSS_VERSION} \
-        libcurand-cross-aarch64-${CUDA_CROSS_VERSION} \
-        libcusolver-cross-aarch64-${CUDA_CROSS_VERSION} \
-        libcublas-cross-aarch64-${CUDA_CROSS_VERSION} \
-        cuda-driver-cross-aarch64-${CUDA_CROSS_VERSION} \
-        cuda-cccl-cross-aarch64-${CUDA_CROSS_VERSION} \
-        cuda-nvcc-cross-aarch64-${CUDA_CROSS_VERSION} \
-        libnpp-cross-aarch64-${CUDA_CROSS_VERSION} \
-        libnvjpeg-cross-aarch64-${CUDA_CROSS_VERSION} && \
     add-apt-repository ppa:deadsnakes/ppa -y && \
-    apt-get update && \
-    apt-get install -y \
-        libssl-dev \
-        curl \
-        wget \
-        unzip \
-        git \
-        rsync \
-        libjpeg-dev \
-        dh-autoreconf \
-        gcc-aarch64-linux-gnu \
-        g++-aarch64-linux-gnu \
-        pkg-config \
-        libtool \
-        libtool-bin \
-        python3-distutils \
-        autogen \
-        zip \
-        python3.8 python3.8-dev \
-        python3.9 python3.9-dev \
-        python3.10 python3.10-dev \
-        python3.11 python3.11-dev \
-        python3.12 python3.12-dev \
-        python3.13 python3.13-dev && \
+    apt-get update && apt-get install -y --no-install-recommends \
+    libssl-dev \
+    curl \
+    wget \
+    unzip \
+    git \
+    rsync \
+    libjpeg-dev \
+    dh-autoreconf \
+    gcc-aarch64-linux-gnu \
+    g++-aarch64-linux-gnu \
+    pkg-config \
+    libtool \
+    libtool-bin \
+    python3-distutils \
+    autogen \
+    zip \
+    python3.8 python3.8-dev \
+    python3.9 python3.9-dev \
+    python3.10 python3.10-dev \
+    python3.11 python3.11-dev \
+    python3.12 python3.12-dev \
+    python3.13 python3.13-dev \
+    cuda-cudart-cross-aarch64-${CUDA_CROSS_VERSION} \
+    libcufft-cross-aarch64-${CUDA_CROSS_VERSION} \
+    libcurand-cross-aarch64-${CUDA_CROSS_VERSION} \
+    libcusolver-cross-aarch64-${CUDA_CROSS_VERSION} \
+    libcublas-cross-aarch64-${CUDA_CROSS_VERSION} \
+    cuda-driver-cross-aarch64-${CUDA_CROSS_VERSION} \
+    cuda-cccl-cross-aarch64-${CUDA_CROSS_VERSION} \
+    cuda-nvcc-cross-aarch64-${CUDA_CROSS_VERSION} \
+    libnpp-cross-aarch64-${CUDA_CROSS_VERSION} \
+    libnvjpeg-cross-aarch64-${CUDA_CROSS_VERSION} && \
      rm -rf /var/lib/apt/lists/* && \
      PYTHON_VER=$(python3 -c "import sys;print(f'{sys.version_info[0]}{sys.version_info[1]}')") && \
      curl -O https://bootstrap.pypa.io/get-pip.py && \