From 2c80a875eb9e4ec849b9637a53a8a1d493c6f3ce 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 | 6 +++---
docker/ci-runner/Dockerfile | 5 ++++-
docker/cobalt/Dockerfile | 4 +++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/configure.sh b/configure.sh
index 10e30b3..ee68cdd 100644
--- a/configure.sh
+++ b/configure.sh
@@ -2,7 +2,7 @@
export LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/12/
# Load Spack environment modules
-module use /opt/spack/0.22.1/share/spack/modules/linux-debian12-zen2/gcc/12.2.0
+module use /opt/spack/${SPACK_VERSION}/share/spack/modules/linux-debian12-zen2/gcc/12.2.0
module load binutils
module load cuda
module load log4cplus
@@ -23,7 +23,7 @@ module load py-lxml
module load curl
# 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 e8e6c22..60d27fc 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 && \
@@ -26,7 +28,8 @@ ENV SPACK_VERSION=0.23.1
ENV SPACK_DIR=/opt/spack/${SPACK_VERSION}
RUN git clone --depth 1 --branch v${SPACK_VERSION} https://github.com/spack/spack.git ${SPACK_DIR}
RUN ln -s ${SPACK_DIR}/bin/spack /usr/local/bin/
-RUN . ${SPACK_DIR}/share/spack/setup-env.sh && spack compiler find # && spack mirror add v${SPACK_VERSION} https://binaries.spack.io/v${SPACK_VERSION}
+RUN . ${SPACK_DIR}/share/spack/setup-env.sh && spack compiler find
+# && spack mirror add v${SPACK_VERSION} https://binaries.spack.io/v${SPACK_VERSION}
ENV SPACK_REPO_DIR=/opt/spack/repos
RUN mkdir -p ${SPACK_REPO_DIR}
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