Resolve "Gitlab-CI migration of the CI/CD pipeline"

Dockerfile

@@ -7,9 +7,7 @@ LABEL org.opencontainers.image.authors="aurore.dupuis@cnes.fr vincent.gaudissart
 LABEL org.opencontainers.image.description="LIS Build container"
 
 # Montage du volume temporaire et utilisation pour apt le site du cnes
-RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cnes \
-    export http_proxy=$(cat /run/secrets/proxy_http_cnes) && \
-    export https_proxy=$(cat /run/secrets/proxy_https_cnes) && \
+RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /kaniko/run/secrets/http_proxy); export https_proxy=$(cat /kaniko/run/secrets/https_proxy); fi && \
     apt-get update -y && \
     apt-get install -y ca-certificates 
 
@@ -18,9 +16,7 @@ COPY certs/* /usr/local/share/ca-certificates/
 RUN update-ca-certificates
 
 # Install required packages
-RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cnes \
-    export http_proxy=$(cat /run/secrets/proxy_http_cnes) && \
-    export https_proxy=$(cat /run/secrets/proxy_https_cnes) && \
+RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /kaniko/run/secrets/http_proxy); export https_proxy=$(cat /kaniko/run/secrets/https_proxy); fi && \
     apt-get update -y --quiet && \
     DEBIAN_FRONTEND=noninteractive apt-get install --quiet --yes --no-install-recommends \
         # basic system installs
@@ -56,14 +52,11 @@ RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cn
         && \
     rm -rf /var/lib/apt/lists/*
 
-
 # Build OTB
-RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cnes \
-    export http_proxy=$(cat /run/secrets/proxy_http_cnes) && \
-    export https_proxy=$(cat /run/secrets/proxy_https_cnes) && \
+RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /kaniko/run/secrets/http_proxy); export https_proxy=$(cat /kaniko/run/secrets/https_proxy); fi && \
     mkdir -p /root/otb-build/build && \
     cd /root/otb-build && \
-    wget -q https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-7.4.1.zip -O /tmp/OTB.zip && \
+    wget --no-check-certificate -q https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-7.4.1.zip -O /tmp/OTB.zip && \
     unzip /tmp/OTB.zip && \
     cd /root/otb-build/build && \
     cmake \
@@ -87,9 +80,7 @@ RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cn
     rm -rf /root/otb-build /tmp/OTB.zip
 
  # Build wxWidgets
-RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cnes \
-    export http_proxy=$(cat /run/secrets/proxy_http_cnes) && \
-    export https_proxy=$(cat /run/secrets/proxy_https_cnes) && \
+RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /kaniko/run/secrets/http_proxy); export https_proxy=$(cat /kaniko/run/secrets/https_proxy); fi && \
     mkdir -p /root/wxwidgets-build/ && \
     cd /root/wxwidgets-build && \
     git clone --branch v3.2.2 https://github.com/wxWidgets/wxWidgets.git && \
@@ -101,9 +92,7 @@ RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cn
     make install -j4
 
  # Build saga-gis
-RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cnes \
-    export http_proxy=$(cat /run/secrets/proxy_http_cnes) && \
-    export https_proxy=$(cat /run/secrets/proxy_https_cnes) && \
+RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /kaniko/run/secrets/http_proxy); export https_proxy=$(cat /kaniko/run/secrets/https_proxy); fi && \
     mkdir -p /root/saga-gis-build/ && \
     cd /root/saga-gis-build && \
     git clone --branch saga-8.4.2 https://github.com/saga-gis/saga-gis.git && \
@@ -123,12 +112,10 @@ RUN  ln -s /usr/bin/python3 /usr/bin/python && \
      chmod a+x /install/lis/app/*
 
 # Build DANS-GDAL scripts
-RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cnes \
-    export http_proxy=$(cat /run/secrets/proxy_http_cnes) && \
-    export https_proxy=$(cat /run/secrets/proxy_https_cnes) && \
+RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /kaniko/run/secrets/http_proxy); export https_proxy=$(cat /kaniko/run/secrets/https_proxy); fi && \
     mkdir -p /root/dans-build && \
     cd /root/dans-build && \
-    wget -q https://github.com/gina-alaska/dans-gdal-scripts/archive/refs/heads/master.zip -O /tmp/dans.zip && \
+    wget --no-check-certificate -q https://github.com/gina-alaska/dans-gdal-scripts/archive/refs/heads/master.zip -O /tmp/dans.zip && \
     unzip /tmp/dans.zip && \
     cd dans-gdal-scripts-master && \
     ./autogen.sh && \
@@ -146,9 +133,7 @@ LABEL org.opencontainers.image.authors="aurore.dupuis@cnes.fr vincent.gaudissart
 LABEL org.opencontainers.image.description="LIS + OTB 7.4 Container"
 
 # system packages
-RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cnes \
-    export http_proxy=$(cat /run/secrets/proxy_http_cnes) && \
-    export https_proxy=$(cat /run/secrets/proxy_https_cnes) && \
+RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /kaniko/run/secrets/http_proxy); export https_proxy=$(cat /kaniko/run/secrets/https_proxy); fi && \
     apt-get update --quiet && \
     apt-get -y upgrade --quiet && \
     DEBIAN_FRONTEND=noninteractive apt-get install --quiet --yes --no-install-recommends \
@@ -197,9 +182,7 @@ RUN mv /usr/local/lib/otbapp_* /usr/local/lib/otb/applications/
 COPY --from=builder /install/dans /usr/local
 
 # Add additionnal dependancies
-RUN --mount=type=secret,id=proxy_http_cnes --mount=type=secret,id=proxy_https_cnes \
-    export http_proxy=$(cat /run/secrets/proxy_http_cnes) && \
-    export https_proxy=$(cat /run/secrets/proxy_https_cnes) && \
+RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /kaniko/run/secrets/http_proxy); export https_proxy=$(cat /kaniko/run/secrets/https_proxy); fi && \
     pip3 install \
     --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org \
     --no-cache-dir \

python/s2snow/hillshade.py

@@ -2,12 +2,12 @@ import logging
 import os
 from datetime import datetime, timedelta
 import numpy as np
-import saga_api
 from lxml import etree
 from osgeo import gdal, osr
 from s2snow.lis_constant import AZIMUTH_PATH, ZENITH_PATH
 from s2snow.lis_exception import UnknownProductException
 from s2snow.otb_wrappers import band_math
+import saga_api
 
 """
 This scripts compute the hillshade from a DEM and a Sentinel2 Metadata file containing the sun angles.