Commit 479ff5d2 authored by Thibaut ROMAIN's avatar Thibaut ROMAIN
Browse files

Merge branch 'develop' into 'release-8.1'

# Conflicts:
#   Modules/Applications/AppProjection/app/otbSuperimpose.cxx
parents 3f970c6d 86de8dbe
Pipeline #11462 passed with stages
in 91 minutes and 42 seconds
......@@ -51,6 +51,7 @@ stages:
- build
- report
- deploy
- docker
.general:
retry:
......@@ -424,3 +425,18 @@ release-container:
--form ref=master
--form variables[OTB_TAG]=$CI_COMMIT_TAG
https://gitlab.orfeo-toolbox.org/api/v4/projects/126/trigger/pipeline
release-docker:
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
stage: docker
only:
refs:
- /^release-[0-9]+\.[0-9]+$/
script:
- /kaniko/executor --cleanup
--verbosity warn
--context $CI_PROJECT_DIR/Docker
--dockerfile $CI_PROJECT_DIR/Docker/Dockerfile
--destination $CI_REGISTRY_IMAGE/orfeotoolbox/otb:$CI_COMMIT_BRANCH
......@@ -129,6 +129,8 @@ excludedfiles = set([
'./CMake/exportheader.cmake.in',
'./CMake/pre-commit',
'./CMake/qt.conf.in',
'./Docker/Dockerfile',
'./Docker/system-dependencies.txt',
'./Documentation/Cookbook/Art/residual_registration-figure.tex',
'./Documentation/Cookbook/rst/Makefile.in',
'./Documentation/Cookbook/rst/conf.py.in',
......
#
# Copyright (C) 2005-2022 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM ubuntu:20.04
ARG OTB_RELEASE=8.0.0
# Install system dependencies
COPY system-dependencies.txt .
RUN apt-get update -y \
&& apt-get upgrade -y \
&& cat system-dependencies.txt | DEBIAN_FRONTEND=noninteractive xargs apt-get install -y --no-install-recommends \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* system-dependencies.txt
# Install pre-compiled OTB binaries
RUN curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$OTB_RELEASE-Linux64.run -o OTB-$OTB_RELEASE-Linux64.run \
&& chmod +x OTB-$OTB_RELEASE-Linux64.run \
&& ./OTB-$OTB_RELEASE-Linux64.run --target /opt/otb \
&& rm OTB-$OTB_RELEASE-Linux64.run
# Symlink Python library to a known path for OTB
RUN ln -s /usr/lib/x86_64-linux-gnu/libpython3.8.so /opt/otb/lib/libpython3.8.so.rh-python38-1.0
# Persistant env
ENV CMAKE_PREFIX_PATH=/opt/otb
ENV PYTHONPATH=/opt/otb/lib/python
ENV GDAL_DRIVER_PATH=disable
ENV GDAL_DATA=/opt/otb/share/gdal
ENV PROJ_LIB=/opt/otb/share/proj
ENV PATH=/opt/otb/bin:$PATH
ENV OTB_APPLICATION_PATH=/opt/otb/lib/otb/applications
ENV LC_NUMERIC=C
# Default command when using 'docker run' or 'docker create'
CMD /bin/bash
ca-certificates
curl
libxcb1
libxcb-composite0
libxcb-glx0
libxcb-icccm4
libxcb-image0
libxcb-keysyms1
libxcb-randr0
libxcb-render0
libxcb-render-util0
libxcb-util1
libxcb-shm0
libxcb-xfixes0
libxcb-xinerama0
libxcb-xinput0
libxcb-xkb1
libxcb-shape0
libx11-xcb1
libglu1-mesa
libxrender1
libxi6
libxkbcommon0
libxkbcommon-x11-0
libxinerama1
python3
python3-dev
python3-numpy
libtool
libopengl0
......@@ -193,8 +193,10 @@ private:
AddParameter(ParameterType_String, "filter.cc.expr", "Condition");
SetParameterDescription("filter.cc.expr",
"User defined connection condition, written as a mathematical expression. Available variables are p(i)b(i), intensity_p(i) and "
"distance (example of expression: distance < 10 )");
"User defined connection condition, written as a mathematical expression. "
"Available variables are 'p(i)b(i)', 'intensity_p(i)' and "
"'distance'. Substitute (i) by the desired value. "
"Example of expression: intensity_p2 > 0.5.");
// Watershed
AddChoice("filter.watershed", "Watershed");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment