From 0bb2c9604d850b32522bd62d34612ed790902721 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Wed, 11 Oct 2023 10:14:03 -0600 Subject: [PATCH 1/7] Update to LaSRC 3.5.1. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 78e5e0a..80b89fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM 018923174646.dkr.ecr.us-west-2.amazonaws.com/hls-base-3.2.0 +FROM 018923174646.dkr.ecr.us-west-2.amazonaws.com/hls-base-3.5.1 ENV PREFIX=/usr/local \ SRC_DIR=/usr/local/src \ GCTPLIB=/usr/local/lib \ From 929ba5020ade08c3cbae1de6a529cb1b4c14fa30 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Wed, 11 Oct 2023 11:20:26 -0600 Subject: [PATCH 2/7] Possible fix for failing hls-thumbnails install. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 80b89fc..eb42ad9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -110,7 +110,7 @@ COPY ./hls_libs/L8like/bandpass_parameter.S2B.txt ${PREFIX}/bandpass_parameter.S RUN pip3 install --upgrade awscli RUN pip3 install click==7.1.2 RUN pip3 install rio-cogeo==1.1.10 --no-binary rasterio --user - +RUN pip3 install pyhdf==0.10.5 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-thumbnails@v1.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-metadata@v2.2 From 7c39d33ba348eba0c937fd85aaab2b90e65cfd1e Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Wed, 11 Oct 2023 18:47:48 -0600 Subject: [PATCH 3/7] Use fixed version of hls-thumbnails. --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb42ad9..ef942bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -110,8 +110,7 @@ COPY ./hls_libs/L8like/bandpass_parameter.S2B.txt ${PREFIX}/bandpass_parameter.S RUN pip3 install --upgrade awscli RUN pip3 install click==7.1.2 RUN pip3 install rio-cogeo==1.1.10 --no-binary rasterio --user -RUN pip3 install pyhdf==0.10.5 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-thumbnails@v1.1 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-thumbnails@v1.2 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-metadata@v2.2 From 3755495edf119e5515f411575683fa0f47b4406a Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 12 Oct 2023 11:39:30 -0600 Subject: [PATCH 4/7] Update location of aerosol_qa band changed in v3.5.1. --- scripts/sentinel_granule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sentinel_granule.sh b/scripts/sentinel_granule.sh index 40264ad..d79efdf 100755 --- a/scripts/sentinel_granule.sh +++ b/scripts/sentinel_granule.sh @@ -118,7 +118,7 @@ hls_espa_two_xml="${espa_id}_2_hls.xml" sr_hdf_one="${espa_id}_sr_1.hdf" sr_hdf_two="${espa_id}_sr_2.hdf" hls_sr_combined_hdf="${espa_id}_sr_combined.hdf" -aerosol_qa="${espa_id}_sr_aerosol.img" +aerosol_qa="${espa_id}_sr_aerosol_qa.img" # Surface reflectance is current final output hls_sr_output_hdf="$granuleoutput" From 5e9b6c3144dde919b15fe2f0d503a813ef0069dc Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 12 Oct 2023 12:06:35 -0600 Subject: [PATCH 5/7] Echo aerosol_qa variable to confirm location. --- scripts/sentinel_granule.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/sentinel_granule.sh b/scripts/sentinel_granule.sh index d79efdf..61dd67e 100755 --- a/scripts/sentinel_granule.sh +++ b/scripts/sentinel_granule.sh @@ -136,6 +136,7 @@ twohdf2one "$sr_hdf_one" "$sr_hdf_two" MTD_MSIL1C.xml MTD_TL.xml LaSRC "$hls_sr_ # Run addFmaskSDS echo "Adding Fmask SDS" +echo "$aerosol_qa" addFmaskSDS "$hls_sr_combined_hdf" "$fmaskbin" "$aerosol_qa" MTD_MSIL1C.xml MTD_TL.xml LaSRC "$hls_sr_output_hdf" # Trim edge pixels for spurious SR values From e9c675818a2922d53b398af521d36d8e2157eda4 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Sat, 14 Oct 2023 10:56:31 -0600 Subject: [PATCH 6/7] Use updated hls-utilities for LaSRC v3.5.1 aerosol_qa name change. --- Dockerfile | 3 +-- scripts/sentinel_granule.sh | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef942bd..ec4c483 100644 --- a/Dockerfile +++ b/Dockerfile @@ -120,11 +120,10 @@ RUN pip3 install wheel RUN pip3 install git+https://github.com/NASA-IMPACT/hls-browse_imagery@v1.7 RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.8 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 COPY ./scripts/* ${PREFIX}/bin/ ENV OMP_NUM_THREADS=4 ENTRYPOINT ["/bin/sh", "-c"] CMD ["sentinel.sh"] - diff --git a/scripts/sentinel_granule.sh b/scripts/sentinel_granule.sh index 61dd67e..d79efdf 100755 --- a/scripts/sentinel_granule.sh +++ b/scripts/sentinel_granule.sh @@ -136,7 +136,6 @@ twohdf2one "$sr_hdf_one" "$sr_hdf_two" MTD_MSIL1C.xml MTD_TL.xml LaSRC "$hls_sr_ # Run addFmaskSDS echo "Adding Fmask SDS" -echo "$aerosol_qa" addFmaskSDS "$hls_sr_combined_hdf" "$fmaskbin" "$aerosol_qa" MTD_MSIL1C.xml MTD_TL.xml LaSRC "$hls_sr_output_hdf" # Trim edge pixels for spurious SR values From 8ea34c9a92e1742382ef2e674223e80531bbb714 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 23 May 2024 16:57:52 -0600 Subject: [PATCH 7/7] Update hls-thumbnails and hls-metadata to remove pyhdf dependency. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec4c483..a1b95ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -110,9 +110,9 @@ COPY ./hls_libs/L8like/bandpass_parameter.S2B.txt ${PREFIX}/bandpass_parameter.S RUN pip3 install --upgrade awscli RUN pip3 install click==7.1.2 RUN pip3 install rio-cogeo==1.1.10 --no-binary rasterio --user -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-thumbnails@v1.2 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-thumbnails@v1.3 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-metadata@v2.2 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-metadata@v2.4 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-manifest@v2.0