Skip to content

Commit

Permalink
Update certificates and use consistent apt cache cleanup command.
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice committed Dec 17, 2024
1 parent ed4fd6c commit 7361c69
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
6 changes: 4 additions & 2 deletions ci-conda.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -133,6 +134,7 @@ case "${LINUX_VER}" in
yum-utils \
gcc \
gcc-c++
update-ca-trust extract
yum clean all
;;
*)
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion ci-wheel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,15 @@ 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
apt install -y git gcc-9 g++-9
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
Expand All @@ -82,6 +83,7 @@ case "${LINUX_VER}" in
automake \
bzip2 \
bzip2-devel \
ca-certificates \
cmake \
curl \
dnf-plugins-core \
Expand All @@ -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++
Expand Down
2 changes: 2 additions & 0 deletions citestwheel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"*)
Expand All @@ -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
Expand Down

0 comments on commit 7361c69

Please sign in to comment.