Merge branch '148-combined-hillshade-filepath' into...

Merge branch '148-combined-hillshade-filepath' into 144-is-lis-compatible-with-a-sentinel-2-c-satellite-nomenclature-and-products

Dockerfile

@@ -149,7 +149,7 @@ RUN if [ -f "/kaniko/run/secrets/http_proxy" ]; then export http_proxy=$(cat /ka
         gdal-bin \
         && \
     rm -rf /var/lib/apt/lists/* && \
-    rm /usr/local/share/ca-certificates/*
+    rm -rf /usr/local/share/ca-certificates/*
 
 # install OTB from builder
 COPY --from=builder /install/otb /usr/local
@@ -171,7 +171,7 @@ ARG GIT_TOKEN
 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 /install && \
     cd /install && \
-    git clone --branch 0.6.1 https://github.com/CNES/rastertools.git && \
+    git clone --branch 0.6.2 https://github.com/CNES/rastertools.git && \
     export PYTHONWARNINGS="ignore:Unverified HTTPS request" && \
     pip3 install \
     --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org \

python/s2snow/snow_detector.py

@@ -169,7 +169,7 @@ def detect_snow(config, output_dir, chain_version=None, product_counter=None):
                 raise
         if config.shaded_snow_hillshade and config.shaded_snow_casted:
             logging.info("Combine both classic hillshade method and rastertools methods.")
-            compute_combined_hillshade_mask(relief_shadow_mask, tmp_dir, hillshade_mask)
+            compute_combined_hillshade_mask(HILLSHADE_MASK, tmp_dir, hillshade_mask)
     else:
         relief_shadow_mask = config.relief_shadow_mask