preparation for merging

scripts/build-dockers.sh

@@ -298,7 +298,7 @@ fi
 
 # Define the parameters
 LIA_VERSION=${LIA_VERSION:-tags/1.1.0rc1}
-GAMMA_AREA_VERSION=${GAMMA_AREA_VERSION:-tmp}
+GAMMA_AREA_VERSION=${GAMMA_AREA_VERSION:-tags/1.2.0rc1}
 S1TD_VERSION=${S1TD_VERSION:-1.3.7}
 OTB_INSTALLER="$(basename "${OTB_package}")"
 FULL_VERSION="${S1TD_VERSION}-${os}${OS_VERSION}-otb${OTB_VERSION}"

ubuntu/base/Dockerfile

@@ -96,7 +96,7 @@ RUN uname -a \
         && apt-get update -y \
         && apt-get upgrade -y \
         && apt-get install -y --no-install-recommends \
-        file \
+        file valgrind \
         g++ cmake make freeglut3-dev git \
         libpython${PYTHON_VERSION} python3 python3-dev python3-numpy python3-pip \
         && chmod +x ./${OTB_INSTALLER} \
@@ -114,7 +114,7 @@ RUN uname -a \
         \
         && python3 -m pip --no-cache-dir install --upgrade pip \
         && python3 -m pip --no-cache-dir install --upgrade --no-cache-dir setuptools==57.5.0 \
-        && python3 -m pip --no-cache-dir install numpy \
+        && python3 -m pip --no-cache-dir install "numpy<2.0" \
         && ctest -S "${OTB_INSTALL_DIRNAME}/share/otb/swig/build_wrapping.cmake" -VV \
         && cd - \
         && python3 -m pip --no-cache-dir install "gdal==$(gdal-config --version)" --no-binary :all: \
@@ -135,13 +135,10 @@ RUN uname -a \
         && cd /tmp \
         && rm -r normlim_sigma0 \
         \
-        && git clone https://gitlab.orfeo-toolbox.org/s1-tiling/gamma0-rtc.git \
+        && git clone https://gitlab.orfeo-toolbox.org/s1-tiling/RTC_gamma0.git \
         && cd /tmp/gamma0-rtc \
         && if [ -n "${GAMMA_AREA_VERSION}" ] ; then echo git -c advice.detachedHead=false checkout "${GAMMA_AREA_VERSION}" ; git -c advice.detachedHead=false checkout "${GAMMA_AREA_VERSION}" ; fi \
         && mkdir _builddir && cd _builddir \
-        && echo "Check C++ stdlib ABI version..." \
-        && libitk="$(ls --indicator-style=none -- ${OTB_INSTALL_DIRNAME}/lib/libITKCommon-*.so)" \
-        && if nm -C "${libitk}" | grep -q std::__cxx11::basic_string ; then echo "New C++ ABI detected" ; else echo "Old C++ ABI detected" ; CXXFLAGS="-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0" ; fi \
         && echo cmake ${CXXFLAGS} -DOTB_BUILD_MODULE_AS_STANDALONE=ON -DCMAKE_INSTALL_PREFIX="${OTB_INSTALL_DIRNAME}" -DCMAKE_BUILD_TYPE=Release .. \
         && cmake ${CXXFLAGS} -DOTB_BUILD_MODULE_AS_STANDALONE=ON -DCMAKE_INSTALL_PREFIX="${OTB_INSTALL_DIRNAME}" -DCMAKE_BUILD_TYPE=Release .. \
         && make && make install \

ubuntu/base/Dockerfile9

@@ -186,13 +186,10 @@ RUN uname -a \
         && cd /tmp \
         && rm -r /tmp/* \
         \
-        && git clone https://gitlab.orfeo-toolbox.org/s1-tiling/gamma0-rtc.git \
+        && git clone https://gitlab.orfeo-toolbox.org/s1-tiling/RTC_gamma0.git \
         && cd /tmp/gamma0-rtc \
         && if [ -n "${GAMMA_AREA_VERSION}" ] ; then echo git -c advice.detachedHead=false checkout "${GAMMA_AREA_VERSION}" ; git -c advice.detachedHead=false checkout "${GAMMA_AREA_VERSION}" ; fi \
         && mkdir _builddir && cd _builddir \
-        && echo "Check C++ stdlib ABI version..." \
-        && libitk="$(ls --indicator-style=none -- ${OTB_INSTALL_DIRNAME}/lib/libITKCommon-*.so)" \
-        && if nm -C "${libitk}" | grep -q std::__cxx11::basic_string ; then echo "New C++ ABI detected" ; else echo "Old C++ ABI detected" ; CXXFLAGS="-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0" ; fi \
         && echo cmake ${CXXFLAGS} -DOTB_BUILD_MODULE_AS_STANDALONE=ON -DCMAKE_INSTALL_PREFIX="${OTB_INSTALL_DIRNAME}" -DCMAKE_BUILD_TYPE=Release .. \
         && cmake ${CXXFLAGS} -DOTB_BUILD_MODULE_AS_STANDALONE=ON -DCMAKE_INSTALL_PREFIX="${OTB_INSTALL_DIRNAME}" -DCMAKE_BUILD_TYPE=Release .. \
         && make && make install \