From 89fb94c7fbdd5ceb2fa05b184c3d55c13fd62f75 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Thu, 26 Oct 2023 16:27:23 +0200
Subject: [PATCH] ubu20, alma8: revert dropped cmake download/install.

---
 alma8/Dockerfile    | 5 ++++-
 ubuntu20/Dockerfile | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/alma8/Dockerfile b/alma8/Dockerfile
index 0022644..08778d8 100644
--- a/alma8/Dockerfile
+++ b/alma8/Dockerfile
@@ -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 \
diff --git a/ubuntu20/Dockerfile b/ubuntu20/Dockerfile
index 6684c6f..3526d07 100644
--- a/ubuntu20/Dockerfile
+++ b/ubuntu20/Dockerfile
@@ -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 \