From 166e1897febe71a710a56c2e5c3ca56f5087f565 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Tue, 22 Apr 2025 10:56:17 +0200
Subject: [PATCH] Small refactors
---
configure.sh | 4 ++--
docker/ci-runner/Dockerfile | 2 ++
docker/cobalt/Dockerfile | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure.sh b/configure.sh
index 803dca4..388fba3 100644
--- a/configure.sh
+++ b/configure.sh
@@ -6,7 +6,7 @@ module use /data/cobalt/spack/latest/share/spack/modules/linux-*/gcc/12.2.0
module load binutils boost casacore cuda curl dal2 diffutils fftw hdf5 log4cplus numactl openblas openmpi py-lxml python unittest-cpp
# tParset is broken, disable it
-sed -i '/lofar_add_test(tParset/s/^/#/' CoInterface/test/CMakeLists.txt
+#sed -i '/lofar_add_test(tParset/s/^/#/' CoInterface/test/CMakeLists.txt
# Run CMake
-cmake -S. -Bgnucxx11_opt
+cmake -S. -B gnucxx11_opt
diff --git a/docker/ci-runner/Dockerfile b/docker/ci-runner/Dockerfile
index f81f423..621ff22 100644
--- a/docker/ci-runner/Dockerfile
+++ b/docker/ci-runner/Dockerfile
@@ -1,5 +1,7 @@
ARG SOURCE_IMAGE="debian:12.10"
FROM ${SOURCE_IMAGE}
+
+ENV SPACK_VERSION=0.23.0
ENV DEBIAN_FRONTEND=noninteractive
RUN apt update && \
diff --git a/docker/cobalt/Dockerfile b/docker/cobalt/Dockerfile
index b6165f9..83ae31c 100644
--- a/docker/cobalt/Dockerfile
+++ b/docker/cobalt/Dockerfile
@@ -1,6 +1,8 @@
ARG SOURCE_IMAGE="git.astron.nl:5000/rd/cobalt-installation/spack:latest"
FROM ${SOURCE_IMAGE}
+ENV SPACK_VERSION=0.23.0
+
COPY ./modules.yaml ./
COPY ./configure.sh ./
@@ -11,7 +13,7 @@ RUN . ${SPACK_DIR}/share/spack/setup-env.sh && \
cp modules.yaml ~/.spack/modules.yaml && \
spack module tcl refresh -y && \
module purge && \
- module use /opt/spack/0.22.1/share/spack/modules/linux-debian12-*/gcc/12.2.0 && \
+ module use /opt/spack/${SPACK_VERSION}/share/spack/modules/linux-debian12-*/gcc/12.2.0 && \
cd cobalt && \
. ../configure.sh && \
make -C gnucxx11_opt/ -j 4
--
GitLab