Cleanup after Ubuntu apt and pip installs

For each apt install, we should update, install and clean all in the
same RUN.  This avoids carrying around apt temporary files in
intermediate layers.

Also, during pip installs, do not cache temporary files.

This change reduced the Ubuntu-22 image size by approximately 0.5GB.

Author: jgarver

Ubuntu-22/Dockerfile

@@ -26,15 +26,21 @@ ENV TZ=UTC
 
 ENV GCC_MAJOR_VERSION=12
 
+# Install utilities
+COPY "apt_cleanup.sh" "/usr/local/bin/"
+RUN cd /usr/local/bin && \
+    mv apt_cleanup.sh apt_cleanup && chmod 755 apt_cleanup
+
 # Preinstall python + dependencies as virtual environment
 RUN apt-get update && \
     apt-get install --yes --no-install-recommends \
       python3 \
-      virtualenv
+      virtualenv && \
+    apt_cleanup
 RUN virtualenv /opt/venv
 ENV VIRTUAL_ENV /opt/venv
 ENV PATH /opt/venv/bin:$PATH
-RUN pip install --upgrade pip \
+RUN pip install --no-cache-dir --upgrade pip \
         -r "https://raw.githubusercontent.com/tianocore/edk2/master/pip-requirements.txt"
 
 
@@ -67,8 +73,7 @@ RUN apt-get update && \
         g++-${GCC_MAJOR_VERSION}-arm-linux-gnueabi gcc-${GCC_MAJOR_VERSION}-arm-linux-gnueabi \
         g++-${GCC_MAJOR_VERSION}-arm-linux-gnueabihf gcc-${GCC_MAJOR_VERSION}-arm-linux-gnueabihf && \
     apt-get upgrade -y && \
-    apt-get clean &&\
-    rm -rf /var/lib/apt/lists/*
+    apt_cleanup
 
 RUN \
     update-alternatives \
@@ -167,15 +172,17 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
     cd .. && \
     rm -rf qemu-build && \
     apt remove --yes \
-        ninja-build
+        ninja-build && \
+    apt_cleanup
+
 
 #####################################################################
 # Dev Image
 #
 FROM test AS dev
 
 # Install convenience tools.  Things we like having around, but aren't
-# required.
+# required.pt
 RUN apt-get update && \
     apt-get install --yes --no-install-recommends \
         bear \
@@ -186,7 +193,7 @@ RUN apt-get update && \
         nano \
         vim \
         && \
-    apt-get clean
+    apt_cleanup
 
 # Setup the entry point
 COPY ubuntu22_dev_entrypoint.sh /usr/libexec/entrypoint

Ubuntu-22/apt_cleanup.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+
+# Utility to cleanup after an apt install or upgrade.
+
+set -e
+set -x
+
+apt-get autoremove -y
+apt-get clean
+rm -rf /var/lib/apt/lists/*

Ubuntu-24/Dockerfile

@@ -29,11 +29,17 @@ ENV TZ=UTC
 
 ENV GCC_MAJOR_VERSION=13
 
+# Install utilities
+COPY "apt_cleanup.sh" "/usr/local/bin/"
+RUN cd /usr/local/bin && \
+    mv apt_cleanup.sh apt_cleanup && chmod 755 apt_cleanup
+
 # Preinstall python + dependencies as virtual environment
 RUN apt-get update && \
     apt-get install --yes --no-install-recommends \
       python3 python3-venv\
-      virtualenv
+      virtualenv && \
+    apt_cleanup
 RUN virtualenv /opt/venv
 ENV VIRTUAL_ENV /opt/venv
 ENV PATH /opt/venv/bin:$PATH
@@ -70,8 +76,7 @@ RUN apt-get update && \
         g++-${GCC_MAJOR_VERSION}-arm-linux-gnueabi gcc-${GCC_MAJOR_VERSION}-arm-linux-gnueabi \
         g++-${GCC_MAJOR_VERSION}-arm-linux-gnueabihf gcc-${GCC_MAJOR_VERSION}-arm-linux-gnueabihf && \
     apt-get upgrade -y && \
-    apt-get clean &&\
-    rm -rf /var/lib/apt/lists/*
+    apt_cleanup
 
 RUN \
     update-alternatives \
@@ -171,7 +176,8 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
     cd .. && \
     rm -rf qemu-build && \
     apt remove --yes \
-        ninja-build
+        ninja-build && \
+    apt_cleanup
 
 #####################################################################
 # Dev Image
@@ -191,7 +197,7 @@ RUN apt-get update && \
         vim \
         cmake \
         && \
-    apt-get clean
+    apt_cleanup
 
 # Setup the entry point
 COPY ubuntu24_dev_entrypoint.sh /usr/libexec/entrypoint

Ubuntu-24/apt_cleanup.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+
+# Utility to cleanup after an apt install or upgrade.
+
+set -e
+set -x
+
+apt-get autoremove -y
+apt-get clean
+rm -rf /var/lib/apt/lists/*