Fix CI

.dockerignore

@@ -6,3 +6,4 @@ docs/build/
 test/
 venv/
 *.egg-info/
+*.sif

.gitignore

@@ -149,3 +149,6 @@ cython_debug/
 
 # Visual Studio settings
 .vscode
+
+# Singularity/Apptainer images
+*.sif

.gitlab-ci.yml

@@ -21,7 +21,7 @@ versioning:
     - ./Docker/fetch_latest_commits.sh | tee commits.txt > versions.env
     - echo RAPTHOR_VERSION=$(./Docker/get_scm_version.sh) >> versions.env
     # Use hash of commits and CI/CD build files to determine tag of base image
-    - sha_files=".gitlab-ci.yml ci/ubuntu_20_04-* commits.txt"
+    - sha_files=".gitlab-ci.yml ci/ubuntu_22_04-* commits.txt"
     - BASE_NAME=${CI_REGISTRY_IMAGE}/base >> versions.env
     - BASE_TAG=$(shasum ${sha_files} | shasum | cut -d" " -f1)
     - FULL_NAME=${CI_REGISTRY_IMAGE}/full
@@ -51,7 +51,7 @@ build-docker-base:
       then
         [ "$BUILD_DOCKER_IMAGE" = "1" ] && DOCKER_CACHE="--no-cache" || DOCKER_CACHE=""
         docker build ${DOCKER_CACHE} \
-          --file ci/ubuntu_20_04-base \
+          --file ci/ubuntu_22_04-base \
           --tag $BASE_IMAGE \
           .
         docker push $BASE_IMAGE
@@ -69,7 +69,7 @@ build-docker-full:
         --build-arg BASE_NAME=$BASE_NAME
         --build-arg BASE_TAG=$BASE_TAG
         --build-arg VERSION=$RAPTHOR_VERSION
-        --file ci/ubuntu_20_04-rapthor
+        --file ci/ubuntu_22_04-rapthor
         --tag $FULL_IMAGE
         .
     - docker push $FULL_IMAGE
@@ -108,7 +108,7 @@ rapthor-test:
     - pip install --upgrade pip
     - pip install tox
   script:
-    - tox -e py38
+    - tox -e py310
 
 # Deploy to docker hub
 deploy-docker:

ci/debug.sh

@@ -14,5 +14,5 @@ else
     cd ${ROOT}
 fi
 
-docker build --tag rapthor/ubuntu_20_04-base  -f "${ROOT}/ci/ubuntu_20_04-base" .
-docker run -it --volume "${ROOT}:/rapthor" --workdir "/rapthor" rapthor/ubuntu_20_04-base bash
+docker build --tag rapthor/ubuntu_22_04-base  -f "${ROOT}/ci/ubuntu_22_04-base" .
+docker run -it --volume "${ROOT}:/rapthor" --workdir "/rapthor" rapthor/ubuntu_22_04-base bash

ci/ubuntu_20_04-base → ci/ubuntu_22_04-base

-FROM ubuntu:20.04 as builder
+FROM ubuntu:22.04 as builder
 
 # This Dockerfile builds a docker image containing all Rapthor's dependencies
 
@@ -150,7 +150,7 @@ RUN python3 -m pip install --upgrade ./rapthor && \
 # The image will now be rebuilt without adding the sources, in order to
 # reduce the size of the image.
 #---------------------------------------------------------------------------
-FROM ubuntu:20.04 as runner
+FROM ubuntu:22.04 as runner
 
 COPY --from=builder /usr/local /usr/local
 
@@ -161,32 +161,32 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         ca-certificates \
         casacore-tools \
         git \
-        libarmadillo9 \
         libatkmm-1.6-1v5 \
-        libboost-date-time1.71.0 \
-        libboost-filesystem1.71.0 \
-        libboost-program-options1.71.0 \
+        libblas3 \
+        libboost-filesystem1.74.0 \
+        libboost-program-options1.74.0 \
         libcairomm-1.0-1v5 \
-        libcasa-casa4 \
-        libcasa-fits4 \
-        libcasa-measures4 \
-        libcasa-ms4 \
-        libcasa-scimath4 \
-        libcasa-tables4 \
-        libcfitsio8 \
+        libcasa-casa6 \
+        libcasa-fits6 \
+        libcasa-measures6 \
+        libcasa-ms6 \
+        libcasa-scimath6 \
+        libcasa-tables6 \
+        libcfitsio9 \
         libfftw3-double3 \
         libfftw3-single3 \
+        libglib2.0-0 \
         libglibmm-2.4-1v5 \
         libgomp1 \
-        libgsl23 \
+        libgsl27 \
         libgtkmm-3.0-1v5 \
-        libhdf5-103 \
-        libhdf5-cpp-103 \
+        libhdf5-103-1 \
+        libhdf5-cpp-103-1 \
         liblapack3 \
         liblua5.3-0 \
         libpangomm-1.4-1v5 \
         libpng16-16 \
-        libpython3.8 \
+        libpython3.10 \
         libsigc++-2.0-0v5 \
         libstdc++6 \
         nodejs \