Skip to content

Commit

Permalink
ubu20, alma8: revert dropped cmake download/install.
Browse files Browse the repository at this point in the history
  • Loading branch information
Axel-Naumann committed Oct 26, 2023
1 parent 99a24e7 commit 89fb94c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
5 changes: 4 additions & 1 deletion alma8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ RUN dnf update -y \
&& dnf install -y --setopt=install_weak_deps=False $(cat packages.txt) \
&& rm -f packages.txt \
&& dnf clean all \
&& rm -rf /var/cache/dnf
&& rm -rf /var/cache/dnf \
&& curl -O -L https://github.com/Kitware/CMake/releases/download/v3.26.2/cmake-3.26.2-linux-x86_64.sh \
&& sh ./cmake-*.sh --skip-license --prefix=/usr/local/ \
&& rm ./cmake-*.sh

RUN mkdir -p /py-venv \
&& python3 -m venv /py-venv/ROOT-CI \
Expand Down
8 changes: 5 additions & 3 deletions ubuntu20/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ RUN apt-get update -qq \
&& apt-get clean -y \
&& rm -rf /var/cache/apt/archives/* \
&& rm -rf /var/lib/apt/lists/* \
&& rm packages.txt

RUN update-ca-certificates
&& rm packages.txt \
&& update-ca-certificates \
&& curl -O -L https://github.com/Kitware/CMake/releases/download/v3.26.2/cmake-3.26.2-linux-x86_64.sh \
&& sh ./cmake-*.sh --skip-license --prefix=/usr/local/ \
&& rm ./cmake-*.sh

RUN mkdir -p /py-venv \
&& python3 -m venv /py-venv/ROOT-CI \
Expand Down

0 comments on commit 89fb94c

Please sign in to comment.