run.sh modification

apptainer.def

@@ -1,17 +1,32 @@
 Bootstrap: docker
 From: opendronemap/nodemicmac:master
+Stage: spython-base
 
 %labels
     Author Sylvain POULAIN
-    Version 1.0
+    Version 1.1
     Description Apptainer container for NodeMICMAC and WebGIS with Entwine and MicMac.
 
 %environment
     export PATH=$PATH:/code/micmac/bin
     export python=$(which python3)
+    export LC_ALL=C
+    export PYTHONUNBUFFERED=1
+    export LD_LIBRARY_PATH="/lib/x86_64-linux-gnu:/usr/lib"
 
 %post
-
+    su -  root # USER root
+
+    # apt-get update
+    # apt-get install -y -qq --no-install-recommends software-properties-common build-essential cmake git exiv2 libimage-exiftool-perl proj-bin gdal-bin figlet imagemagick pdal libpdal-dev libboost-all-dev libtbb-dev libssl-dev libcurl4-openssl-dev pkg-config libpth-dev curl libx11-dev python3-pip python3-setuptools python3-shapely apt-utils p7zip-full
+
+    # pip3 install -U shyaml
+    # pip3 install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org appsettings
+    # pip3 install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org utm
+    # pip3 install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org pyproj #==2.2.0
+    # pip3 install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org scikit-image
+    # ln -s /lib/x86_64-linux-gnu/*.so /usr/lib/
+
     mkdir -p /var/www
 
     mkdir -p "/var/www"

micmac/run.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
-echo "NodeMICMAC"
 
 RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-$RUNPATH/run.py "$@"
-exit 0
+if [ -e $RUNPATH/venv ]; then
+    source $RUNPATH/venv/bin/activate
+fi
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/lib/$(uname -i)-linux-gnu
+/usr/bin/python3 $RUNPATH/run.py "$@"