ENH: update script to deploy gamma0-rtc

.gitlab-ci.yml

 variables:
     S1TD_VERSION: "1.3.7"  # S1Tiling Dockers version
     LIA_VERSION:  "tags/1.1.0rc1"  # git-tag to use to fetch s1-tiling/normlim_sigma0.git
+    GAMMA_AREA_VERSION:  "tags/1.1.0rc1"  # git-tag to use to fetch s1-tiling/gamma0-rtc.git
     OTB7_VERSION: "7.4.1"
     OTB8_VERSION: "8.1.2"
     OTB9_VERSION: "9.0.0"
@@ -44,6 +45,7 @@ stages:
       --build-arg OTB_ARCHIVE_SAR
       --build-arg OTB_ARCHIVE_FEATURE_EXTRACTION
       --build-arg LIA_VERSION
+      --build-arg GAMMA_AREA_VERSION
       --build-arg S1TD_VERSION
       --build-arg FULL_VERSION
       --build-arg OS_VERSION

scripts/build-dockers.sh

@@ -298,6 +298,7 @@ fi
 
 # Define the parameters
 LIA_VERSION=${LIA_VERSION:-tags/1.1.0rc1}
+GAMMA_AREA_VERSION=${GAMMA_AREA_VERSION:-tmp}
 S1TD_VERSION=${S1TD_VERSION:-1.3.7}
 OTB_INSTALLER="$(basename "${OTB_package}")"
 FULL_VERSION="${S1TD_VERSION}-${os}${OS_VERSION}-otb${OTB_VERSION}"
@@ -349,6 +350,7 @@ else
 fi
 echo "- OTB version:      ${OTB_VERSION}"
 echo "- LIA version:      ${LIA_VERSION}"
+echo "- GAMMA_AREA version: ${GAMMA_AREA}"
 echo "- FULL_VERSION:     ${FULL_VERSION}"
 echo "- PYTHON_VERSION:   ${PYTHON_VERSION}"
 
@@ -400,6 +402,7 @@ if _belongs base "${type_list[@]}" ; then
     step_dockerfile['base']="$(readlink -f "${root_dir}/${os}/base/${DOCKERFILE_NAME_base}")"
     step_args['base']="--build-arg OTB_ORIG=."
     [ -z "${LIA_VERSION}" ] || step_args['base']="${step_args['base']} --build-arg LIA_VERSION=${LIA_VERSION}"
+    [ -z "${GAMMA_AREA_VERSION}" ] || step_args['base']="${step_args['base']} --build-arg GAMMA_AREA_VERSION=${GAMMA_AREA_VERSION}"
     tree "${tmp_wrk_dir}"
     echo "  -> Work dir for 'base': '${base_wrk_dir}'"
 fi

ubuntu/base/Dockerfile

@@ -22,6 +22,7 @@
 # Authors: Aurélien BRICIER (CS Group France)
 #          Mickaël SAVINAUD (CS Group France)
 #          Luc HERMITTE     (CS Group France)
+#          Fabien CONTIVAL  (CS Group France)
 #
 # =========================================================================
 
@@ -39,6 +40,7 @@ ARG OTB_ORIG=https://www.orfeo-toolbox.org/packages/archives/OTB
 ARG OTB_VERSION=7.4.1
 ARG PYTHON_VERSION
 ARG LIA_VERSION
+ARG GAMMA_AREA_VERSION
 
 LABEL org.opencontainers.image.authors="CS Group France, CNES"
 LABEL org.opencontainers.image.base.name="ubuntu:${OS_VERSION}"
@@ -120,7 +122,7 @@ RUN uname -a \
         && python3 -c "from osgeo import gdal_array; print('SUCCESS')" \
         \
         && git clone https://gitlab.orfeo-toolbox.org/s1-tiling/normlim_sigma0.git \
-        && cd normlim_sigma0 \
+        && cd /tmp/normlim_sigma0 \
         && if [ -n "${LIA_VERSION}" ] ; then echo git -c advice.detachedHead=false checkout "${LIA_VERSION}" ; git -c advice.detachedHead=false checkout "${LIA_VERSION}" ; fi \
         && mkdir _builddir && cd _builddir \
         && echo "Check C++ stdlib ABI version..." \
@@ -131,7 +133,21 @@ RUN uname -a \
         && make && make install \
         && mv "${OTB_INSTALL_DIRNAME}/lib"/otbapp_*.so "${OTB_INSTALL_DIRNAME}/lib/otb/applications" \
         && cd /tmp \
-        && rm -r normlim_sigma0 \
+        && rm -r /tmp/* \
+        \
+        && git clone https://{user}:{token}@gitlab.orfeo-toolbox.org/s1-tiling/gamma0-rtc.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 \
+        && mv "${OTB_INSTALL_DIRNAME}/lib"/otbapp_*.so "${OTB_INSTALL_DIRNAME}/lib/otb/applications" \
+        && cd /tmp \
+        && rm -r /tmp/* \
         \
         && rm -r "${OTB_INSTALL_DIRNAME}/share/otb/swig/build" \
         && rm -r "${OTB_INSTALL_DIRNAME}/bin/otbgui"* \

ubuntu/base/Dockerfile9

@@ -22,6 +22,7 @@
 # Authors: Aurélien BRICIER (CS Group France)
 #          Mickaël SAVINAUD (CS Group France)
 #          Luc HERMITTE     (CS Group France)
+#          Fabien CONTIVAL  (CS Group France)
 #
 # =========================================================================
 
@@ -42,6 +43,7 @@ ARG OTB_ORIG=https://www.orfeo-toolbox.org/packages/archives/OTB
 ARG OTB_VERSION=9.0.0
 ARG PYTHON_VERSION
 ARG LIA_VERSION
+ARG GAMMA_AREA_VERSION
 
 LABEL org.opencontainers.image.authors="CS Group France, CNES"
 LABEL org.opencontainers.image.base.name="ubuntu:${OS_VERSION}"
@@ -171,7 +173,7 @@ RUN uname -a \
         && cd - \
         \
         && git clone https://gitlab.orfeo-toolbox.org/s1-tiling/normlim_sigma0.git \
-        && cd normlim_sigma0 \
+        && cd /tmp/normlim_sigma0 \
         && if [ -n "${LIA_VERSION}" ] ; then echo git -c advice.detachedHead=false checkout "${LIA_VERSION}" ; git -c advice.detachedHead=false checkout "${LIA_VERSION}" ; fi \
         && mkdir _builddir && cd _builddir \
         && echo "Check C++ stdlib ABI version..." \
@@ -184,6 +186,20 @@ RUN uname -a \
         && cd /tmp \
         && rm -r /tmp/* \
         \
+        && git clone https://{user}:{token}@gitlab.orfeo-toolbox.org/s1-tiling/gamma0-rtc.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 \
+        && mv "${OTB_INSTALL_DIRNAME}/lib"/otbapp_*.so "${OTB_INSTALL_DIRNAME}/lib/otb/applications" \
+        && cd /tmp \
+        && rm -r /tmp/* \
+        \
         && rm -r "${OTB_INSTALL_DIRNAME}/lib/python3" \
         && export LD_LIBRARY_PATH="${OTB_INSTALL_DIRNAME}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
         && python3 -m pip --no-cache-dir install "gdal==$(gdal-config --version)" --no-binary :all: \