#345

conda/apptainer.def

@@ -1,5 +1,5 @@
 Bootstrap: docker
-From: ubuntu
+From: centos:7
 
 %environment
     export CASA=/casa
@@ -9,20 +9,21 @@ From: ubuntu
     export CASA_BUILD=$CASA/build
     export CASA_INSTALL=$CASA/install
     export CASA_TESTS=$CASA/tests
-    export BRAINVISA_BVMAKER_CFG=$CASA_SRC/bv_maker.cfg
-    for f in "$CASA_SRC/environment.sh" "$CASA_CONF/environment.sh" "$CASA/environment.sh"; do
-        if [ -e "$f" ]; then
-            source "$f"
-        fi
-    done
 
 %post
     mkdir /casa
-    apt update
-    apt install distro-info-data # to get lsb_release
+    #apt update
+    #apt install distro-info-data # to get lsb_release
 
 %runscript
-    export PATH=/casa/conda/bin:$PATH
-    export LD_LIBRARY_PATH=/casa/conda/lib:$LD_LIBRARY_PATH
-
+    if [ "$UID" != "0" ]; then
+        export BRAINVISA_BVMAKER_CFG=$CASA_SRC/bv_maker.cfg
+        for f in "$CASA_SRC/environment.sh" "$CASA_CONF/environment.sh" "$CASA/environment.sh"; do
+            if [ -e "$f" ]; then
+                source "$f"
+            fi
+        done
+        export PATH=/casa/conda/bin:$PATH
+        export LD_LIBRARY_PATH=/casa/conda/lib:$LD_LIBRARY_PATH
+    fi
     exec "$@"

conda/setup_dev_apt

@@ -7,5 +7,5 @@
 set -x
 set -e
 
-apt install -y libgl1-mesa-dev
-# yum install mesa-libGL
+#apt install -y libgl1-mesa-dev
+yum install -y mesa-libGL

conda/setup_run_conda

@@ -76,6 +76,7 @@ build_dependencies=(
     # is only installed with sip package version 4.* but sip
     # package depends on sip 6.*
     pyqt
+    'sysroot_linux-64=2.17'
     qtconsole #? was python3-qtconsole
     'matplotlib==3.4.3'
     #pyqt5-sip
@@ -103,6 +104,7 @@ matlab_runtime_dependencies=(
 
 # Generally useful packages
 generally_useful_packages=(
+    bash-completion
     ca-certificates
     curl
     file