From d09b164e7df4f34e510562827b43c1a1c8f44d23 Mon Sep 17 00:00:00 2001 From: alex <alex@tls-tautenburg.de> Date: Tue, 7 Nov 2023 12:38:34 +0000 Subject: [PATCH] Fix CI cmake issue --- Docker/Dockerfile-base | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Docker/Dockerfile-base b/Docker/Dockerfile-base index 2525d0ca..5e21f8e4 100644 --- a/Docker/Dockerfile-base +++ b/Docker/Dockerfile-base @@ -3,7 +3,7 @@ FROM ubuntu:20.04 as builder # This Docker image builds the dependencies for the Rapthor pipeline. # It lives on the head of its dependencies. -# Install all build-time dependencies +# Install all build-time dependencies (+pip for debugging) RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get install -y \ @@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3 \ python3-casacore \ python3-numpy \ + python3-pip \ wcslib-dev \ wget && \ mkdir -p /src @@ -93,9 +94,11 @@ RUN git clone --no-checkout \ cmake .. && \ make install -j`nproc` +# added pip install cmake to get the newest cmake for Everybeam ARG EVERYBEAM_COMMIT=master RUN git clone --no-checkout \ https://git.astron.nl/RD/EveryBeam.git && \ + python3 -m pip install --upgrade cmake && \ mkdir EveryBeam/build && \ cd EveryBeam && git checkout ${EVERYBEAM_COMMIT} && \ cd build && \ -- GitLab