debugging for proppy

iturhfprop-service/Dockerfile

@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
     curl \
     tar \
     ca-certificates \
+    findutils \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && rm -rf /var/lib/apt/lists/*
@@ -21,13 +22,17 @@ RUN curl -L -o ITURHFProp "https://github.com/ITU-R-Study-Group-3/ITU-R-HF/relea
     && curl -L -o libp372.so "https://github.com/ITU-R-Study-Group-3/ITU-R-HF/releases/download/v14.3/libp372.so" \
     && chmod +x ITURHFProp
 
-# Download source to get Data files - use wildcard to handle directory naming
+# Download source to get Data files
 RUN curl -L -o source.tar.gz "https://github.com/ITU-R-Study-Group-3/ITU-R-HF/archive/refs/tags/v14.3.tar.gz" \
     && tar -xzf source.tar.gz \
-    && ls -la \
+    && ls -la ITU-R-HF-14.3/ \
-    && mv ITU-R-HF-*/Data . \
+    && find ITU-R-HF-14.3 -type d -name "Data" \
-    && mv ITU-R-HF-*/IonMap . \
+    && find ITU-R-HF-14.3 -type d -name "IonMap"
-    && rm -rf ITU-R-HF-* source.tar.gz
+
+# Move Data directories from wherever they are in the source tree
+RUN cp -r ITU-R-HF-14.3/P533/Data . || cp -r ITU-R-HF-14.3/Data . || echo "Data not found at expected locations" \
+    && cp -r ITU-R-HF-14.3/P533/IonMap . || cp -r ITU-R-HF-14.3/IonMap . || echo "IonMap not found at expected locations" \
+    && rm -rf ITU-R-HF-14.3 source.tar.gz
 
 # Set library path so ITURHFProp can find shared libs
 ENV LD_LIBRARY_PATH=/opt/iturhfprop:$LD_LIBRARY_PATH