Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main Repositories
otb
Commits
167a39c5
Commit
167a39c5
authored
6 months ago
by
Tristan Laurent
Browse files
Options
Downloads
Patches
Plain Diff
BUG: correction on docker and on post_install
parent
c65355ae
No related branches found
Branches containing commit
No related tags found
1 merge request
!1047
Retrieve improvments from 9.1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Docker/Dockerfile
+5
-1
5 additions, 1 deletion
Docker/Dockerfile
Docker/system-dependencies.txt
+1
-1
1 addition, 1 deletion
Docker/system-dependencies.txt
Packaging/Files/otbenv.profile
+5
-5
5 additions, 5 deletions
Packaging/Files/otbenv.profile
with
11 additions
and
7 deletions
Docker/Dockerfile
+
5
−
1
View file @
167a39c5
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Docker/system-dependencies.txt
+
1
−
1
View file @
167a39c5
...
...
@@ -9,4 +9,4 @@ gcc
g++
swig
findutils
file
\ No newline at end of file
file
This diff is collapsed.
Click to expand it.
Packaging/Files/otbenv.profile
+
5
−
5
View file @
167a39c5
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment