From 7361c698dd94a20ac383675c294aa9f848b21298 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Mon, 16 Dec 2024 19:19:38 -0600
Subject: [PATCH] Update certificates and use consistent apt cache cleanup
 command.

---
 ci-conda.Dockerfile    | 6 ++++--
 ci-wheel.Dockerfile    | 5 ++++-
 citestwheel.Dockerfile | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
index da00a44..2505259 100644
--- a/ci-conda.Dockerfile
+++ b/ci-conda.Dockerfile
@@ -120,7 +120,8 @@ case "${LINUX_VER}" in
       wget \
       gcc \
       g++
-    rm -rf "/var/lib/apt/lists/*"
+    update-ca-certificates
+    rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
     ;;
   "rockylinux"*)
     yum -y update
@@ -133,6 +134,7 @@ case "${LINUX_VER}" in
       yum-utils \
       gcc \
       gcc-c++
+    update-ca-trust extract
     yum clean all
     ;;
   *)
@@ -164,7 +166,7 @@ case "${CUDA_VER}" in
         # apt will not work correctly if it thinks it needs the build-essential dependency
         # so we patch it out with a sed command
         sed -i 's/, build-essential//g' /var/lib/dpkg/status
-        rm -rf "/var/lib/apt/lists/*"
+        rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
         ;;
       "rockylinux"*)
         yum -y update
diff --git a/ci-wheel.Dockerfile b/ci-wheel.Dockerfile
index 3d32be7..8b30496 100644
--- a/ci-wheel.Dockerfile
+++ b/ci-wheel.Dockerfile
@@ -64,6 +64,7 @@ case "${LINUX_VER}" in
       yasm \
       zip \
       zlib1g-dev
+    update-ca-certificates
     add-apt-repository ppa:git-core/ppa
     add-apt-repository ppa:ubuntu-toolchain-r/test
     apt update -y
@@ -71,7 +72,7 @@ case "${LINUX_VER}" in
     add-apt-repository -r ppa:git-core/ppa
     add-apt-repository -r ppa:ubuntu-toolchain-r/test
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 --slave /usr/bin/g++ g++ /usr/bin/g++-9 --slave /usr/bin/gcov gcov /usr/bin/gcov-9
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
     ;;
   "rockylinux"*)
     dnf update -y
@@ -82,6 +83,7 @@ case "${LINUX_VER}" in
       automake \
       bzip2 \
       bzip2-devel \
+      ca-certificates \
       cmake \
       curl \
       dnf-plugins-core \
@@ -107,6 +109,7 @@ case "${LINUX_VER}" in
       xz-devel \
       zip \
       zlib-devel
+    update-ca-trust extract
     dnf config-manager --set-enabled powertools
     dnf install -y blas-devel lapack-devel
     dnf -y install gcc-toolset-11-gcc gcc-toolset-11-gcc-c++
diff --git a/citestwheel.Dockerfile b/citestwheel.Dockerfile
index 773fa39..02f1327 100644
--- a/citestwheel.Dockerfile
+++ b/citestwheel.Dockerfile
@@ -69,6 +69,7 @@ case "${LINUX_VER}" in
       wget \
       xz-utils \
       zlib1g-dev
+    update-ca-certificates
     rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
     ;;
   "rockylinux"*)
@@ -94,6 +95,7 @@ case "${LINUX_VER}" in
       xz \
       xz-devel \
       zlib-devel
+    update-ca-trust extract
     dnf clean all
     pushd tmp
     wget https://www.openssl.org/source/openssl-1.1.1k.tar.gz