Clean caches

Author: bthomee

docker/debian/Dockerfile

@@ -26,6 +26,8 @@ ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
 apt update
 apt upgrade -y
 apt install -y tzdata
+apt clean
+rm -rf /var/lib/apt/lists/*
 dpkg-reconfigure --frontend noninteractive tzdata
 EOF
 
@@ -50,6 +52,8 @@ pkgs+=(pipx)            # Package manager for Python applications.
 pkgs+=(wget)            # Required build tool.
 apt update
 apt install -y --no-install-recommends "${pkgs[@]}"
+apt clean
+rm -rf /var/lib/apt/lists/*
 EOF
 
 # Install Python-based tools.
@@ -95,9 +99,6 @@ EOF
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
-# Clean up unnecessary files to reduce image size.
-RUN rm -rf /var/lib/apt/lists/* && apt clean
-
 # Switch to the non-root user.
 USER ${NONROOT_USER}
 WORKDIR /home/${NONROOT_USER}
@@ -132,13 +133,12 @@ printf "%s\n%s\n" \
   | tee /etc/apt/sources.list.d/llvm.list
 apt update
 apt install -t llvm-toolchain-${DEBIAN_VERSION}-${CLANG_VERSION} -y --no-install-recommends clang-${CLANG_VERSION} llvm-${CLANG_VERSION}
+apt clean
+rm -rf /var/lib/apt/lists/*
 EOF
 ENV CC=/usr/bin/clang-${CLANG_VERSION}
 ENV CXX=/usr/bin/clang++-${CLANG_VERSION}
 
-# Clean up unnecessary files to reduce image size.
-RUN rm -rf /var/lib/apt/lists/* && apt clean
-
 # Switch to the non-root user.
 USER ${NONROOT_USER}
 WORKDIR /home/${NONROOT_USER}

docker/rhel/Dockerfile

@@ -43,8 +43,7 @@ COPY --from=rocky /usr/bin/flex /usr/bin/flex
 # Install Python-based tools.
 ARG CONAN_VERSION
 ARG GCOVR_VERSION
-RUN pip install conan==${CONAN_VERSION} && \
-    pip install gcovr==${GCOVR_VERSION}
+RUN pip install --no-cache conan==${CONAN_VERSION} gcovr==${GCOVR_VERSION}
 
 # Create the user to switch to, once all packages have been installed.
 ARG NONROOT_USER
@@ -55,13 +54,14 @@ FROM base AS gcc
 
 # Install GCC.
 ARG GCC_VERSION
-RUN dnf install -y --setopt=tsflags=nodocs gcc-toolset-${GCC_VERSION}-gcc gcc-toolset-${GCC_VERSION}-gcc-c++
+RUN <<EOF
+dnf install -y --setopt=tsflags=nodocs gcc-toolset-${GCC_VERSION}-gcc gcc-toolset-${GCC_VERSION}-gcc-c++
+dnf -y clean all
+rm -rf /var/cache/dnf/*
+EOF
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
-# Clean up unnecessary files to reduce image size.
-RUN dnf -y clean all
-
 # Switch to the non-root user.
 USER ${NONROOT_USER}
 WORKDIR /home/${NONROOT_USER}
@@ -89,13 +89,14 @@ FROM base AS clang
 
 # Install Clang. Note that in the RHEL UBIs, we cannot choose the Clang version
 # to install and we get what is available.
-RUN dnf install -y --setopt=tsflags=nodocs clang llvm
+RUN <<EOF
+dnf install -y --setopt=tsflags=nodocs clang llvm
+dnf -y clean all
+rm -rf /var/cache/dnf/*
+EOF
 ENV CC=/usr/bin/clang
 ENV CXX=/usr/bin/clang++
 
-# Clean up unnecessary files to reduce image size.
-RUN dnf -y clean all
-
 # Switch to the non-root user.
 USER ${NONROOT_USER}
 WORKDIR /home/${NONROOT_USER}

docker/ubuntu/Dockerfile

@@ -15,6 +15,7 @@ ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
 apt update
 apt upgrade -y
 apt install -y tzdata
+rm -rf /var/lib/apt/lists/* && apt clean
 dpkg-reconfigure --frontend noninteractive tzdata
 EOF
 
@@ -39,6 +40,8 @@ pkgs+=(pipx)            # Package manager for Python applications.
 pkgs+=(wget)            # Required build tool.
 apt update
 apt install -y --no-install-recommends "${pkgs[@]}"
+apt clean
+rm -rf /var/lib/apt/lists/*
 EOF
 
 # Install Python-based tools.
@@ -59,7 +62,11 @@ FROM base AS gcc
 
 # Install GCC.
 ARG GCC_VERSION
-RUN apt install -y gcc-${GCC_VERSION} g++-${GCC_VERSION}
+RUN <<EOF
+apt install -y gcc-${GCC_VERSION} g++-${GCC_VERSION}
+apt clean
+rm -rf /var/lib/apt/lists/*
+EOF
 ENV CC=/usr/bin/gcc-${GCC_VERSION}
 ENV CXX=/usr/bin/g++-${GCC_VERSION}
 
@@ -89,13 +96,14 @@ FROM base AS clang
 
 # Install Clang.
 ARG CLANG_VERSION
-RUN apt install -y clang-${CLANG_VERSION} llvm-${CLANG_VERSION}
+RUN <<EOF
+apt install -y clang-${CLANG_VERSION} llvm-${CLANG_VERSION}
+apt clean
+rm -rf /var/lib/apt/lists/*
+EOF
 ENV CC=/usr/bin/clang-${CLANG_VERSION}
 ENV CXX=/usr/bin/clang++-${CLANG_VERSION}
 
-# Clean up unnecessary files to reduce image size.
-RUN rm -rf /var/lib/apt/lists/* && apt clean
-
 # Switch to the non-root user.
 USER ${NONROOT_USER}
 WORKDIR /home/${NONROOT_USER}