Skip to content
Snippets Groups Projects
Commit 167a39c5 authored by Tristan Laurent's avatar Tristan Laurent
Browse files

BUG: correction on docker and on post_install

parent c65355ae
No related branches found
No related tags found
1 merge request!1047Retrieve improvments from 9.1
......@@ -42,8 +42,12 @@ ENV PROJ_LIB=/app/otb/share/proj
ENV PATH=/app/otb/bin:$PATH
ENV LD_LIBRARY_PATH=/app/otb/lib:$LD_LIBRARY_PATH
ENV OTB_APPLICATION_PATH=/app/otb/lib/otb/applications
ENV OTB_INSTALL_DIR=/app/otb
ENV LC_NUMERIC=C
ENV OTB_INSTALL_DIR=/app/otb
# run post install to apply sed commands on cmake files and to get python
# bindings if needed
RUN sh /app/otb/tools/post_install.sh
# Default command when using 'docker run' or 'docker create'
RUN sh /app/otb/tools/post_install.sh && sh /app/otb/recompile_bindings.sh
......
......@@ -9,4 +9,4 @@ gcc
g++
swig
findutils
file
\ No newline at end of file
file
......@@ -72,13 +72,13 @@ fi
LC_NUMERIC=C
# set GDAL_DATA variable used by otb application
GDAL_DATA=$OTB_INSTALL_DIR/share/gdal
GDAL_DATA="$OTB_INSTALL_DIR/share/gdal"
PROJ_LIB=$OTB_INSTALL_DIR/share/proj
PROJ_LIB="$OTB_INSTALL_DIR/share/proj"
export GDAL_DRIVER_PATH=disable
export LD_LIBRARY_PATH=$OTB_INSTALL_DIR/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="$OTB_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
# export variables
export LC_NUMERIC
......@@ -91,9 +91,9 @@ export OTB_INSTALL_DIR
# The first time after install, run that script to patch cmake files with the right install path. This cannot be done until OTB is installed
# This call permits to the user not to launch this by hand
if [ ! -e $OTB_INSTALL_DIR/tools/install_done.txt ]
if [ ! -e "$OTB_INSTALL_DIR"/tools/install_done.txt ]
then
source $OTB_INSTALL_DIR/tools/post_install.sh
source "$OTB_INSTALL_DIR"/tools/post_install.sh
else
echo "**** OTB environment setup complete ****"
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment