#345 trying to compile with conda-forge packages and OpenGL in container

brainvisa · May 23, 2023 · b1f30b7 · b1f30b7
1 parent 32eabb9
commit b1f30b7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/conda/apptainer.def b/conda/apptainer.def
@@ -1,5 +1,5 @@
 Bootstrap: docker
-From: ubuntu:22.04
+From: ubuntu
 
 %environment
     export CASA=/casa
@@ -19,6 +19,7 @@ From: ubuntu:22.04
 %post
     mkdir /casa
     apt update
+    apt install distro-info-data # to get lsb_release
 
 %runscript
     export PATH=/casa/conda/bin:$PATH

diff --git a/conda/setup_conda b/conda/setup_conda
@@ -49,7 +49,7 @@ if [ ! -e "$casaconda/conda" ]; then
     $apptainer /casa/src/casa-distro/conda/setup_dev_conda
 fi
 
-#$root_apptainer /casa/src/casa-distro/conda/setup_run_compiled
+$root_apptainer /casa/src/casa-distro/conda/setup_run_compiled
 
 if [ ! -e "$casaconda/src" ]; then
     $apptainer git clone https://github.com/sapetnioc/brainvisa-submodules /casa/src

diff --git a/conda/setup_dev_apt b/conda/setup_dev_apt
@@ -8,4 +8,4 @@ set -x
 set -e
 
 apt install -y libgl1-mesa-dev
-
+# yum install mesa-libGL
diff --git a/conda/setup_dev_conda b/conda/setup_dev_conda
@@ -20,6 +20,7 @@ fi
 version_control_packages=(
     git
     git-lfs
+    vcstool
     #! git-man
     #! subversion still necessary ?
 )

diff --git a/conda/setup_run_apt b/conda/setup_run_apt
@@ -7,4 +7,5 @@
 set -x
 set -e
 
-apt install -y wget build-essential distro-info-data
+# apt install -y wget # build-essential
+# yum install wget
diff --git a/conda/setup_run_conda b/conda/setup_run_conda
@@ -75,14 +75,14 @@ build_dependencies=(
     # to avoid an upgrade of sip package. The sip command
     # is only installed with sip package version 4.* but sip
     # package depends on sip 6.*
-    # pyqt
-    # qtconsole #? was python3-qtconsole
-    # 'matplotlib==3.4.3'
-    pyqt5-sip
-    'sip=4'
-    qt-main
-    qtconsole-base
-    'matplotlib-base==3.4.3'
+    pyqt
+    qtconsole #? was python3-qtconsole
+    'matplotlib==3.4.3'
+    #pyqt5-sip
+    #'sip=4'
+    #qt-main
+    #qtconsole-base
+    #'matplotlib-base==3.4.3'
 )
 
 # Runtime dependencies of FSL
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ set -x
		set -e

		apt install -y libgl1-mesa-dev

		# yum install mesa-libGL
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ fi @@
     version_control_packages=(
         git
         git-lfs
+        vcstool
         #! git-man
         #! subversion still necessary ?
     )
@@ Expand Down @@