read dependencies from centralized xml

Author: jginternational

dockers/deploy.bat

@@ -1,8 +1,11 @@
 set krversion=10.3.0
-set pyversion=3.11
+set pyversion=3.12
 @REM 3.10.10-alpine3.17
 echo "Building kratos %krversion% on python %pyversion%"
-docker build --build-arg krversion=%krversion% --build-arg pyversion=%pyversion% -t kratos-run:%krversion% -t kratos-run:latest .
+set SCRIPT_DIR=%~dp0
+set ROOT_DIR=%SCRIPT_DIR%..
+
+docker build --build-arg pyversion=%pyversion% -f "%ROOT_DIR%\dockers\dockerfile" -t kratos-run:%krversion% -t kratos-run:latest "%ROOT_DIR%"
 
 docker tag kratos-run:%krversion% fjgarate/kratos-run:%krversion%
 docker push fjgarate/kratos-run:%krversion%

dockers/dockerfile

@@ -1,20 +1,22 @@
 # Default values. Use --build-arg on build to change
-ARG pyversion=3.11
+ARG pyversion=3.12
 
 # Base pyton image
 FROM python:$pyversion
-# FROM python:3.10.10-alpine3.17
 
 # Update pip
 RUN pip install --upgrade pip
 
-ARG krversion=10.3.0
-
 # WORKDIR /tmp
 # COPY ./wheels/ ./wheels/
 
-# Install Kratos and dependencies
-RUN python3 -m pip install KratosMultiphysics-all==$krversion numpy
+# Copy dependency manifest from Kratos GiD
+COPY kratos.gid/kratos.xml /tmp/kratos.xml
+COPY dockers/generate_requirements_from_xml.py /tmp/generate_requirements_from_xml.py
+
+# Install Kratos packages listed in kratos.xml
+RUN python3 /tmp/generate_requirements_from_xml.py --xml /tmp/kratos.xml --out /tmp/requirements.txt \
+    && python3 -m pip install --no-cache-dir -r /tmp/requirements.txt
 # RUN python3 -m pip install ./wheels/*.whl
 
 # Prepare run folder
@@ -24,5 +26,5 @@ RUN chmod 777 /model
 # Kratos will start on docker run
 CMD [ "python3", "MainKratos.py" ]
 
-# docker build -t kratos-run .
+# docker build -t kratos-run -f dockers/dockerfile .
 # docker run -rm -it  --entrypoint bash kratos-run

dockers/generate_requirements_from_xml.py

@@ -0,0 +1,42 @@
+import argparse
+import xml.etree.ElementTree as ET
+from pathlib import Path
+
+
+def build_requirements(xml_path: Path) -> list[str]:
+    root = ET.parse(xml_path).getroot()
+    requirements: list[str] = []
+    seen: set[str] = set()
+
+    for package in root.findall("./Program/PythonPackages/Package"):
+        name = (package.get("Name") or "").strip()
+        version = (package.get("Version") or "").strip()
+        if not name:
+            continue
+
+        requirement = f"{name}=={version}" if version else name
+        if requirement in seen:
+            continue
+
+        requirements.append(requirement)
+        seen.add(requirement)
+
+    return requirements
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--xml", required=True)
+    parser.add_argument("--out", required=True)
+    args = parser.parse_args()
+
+    xml_path = Path(args.xml)
+    out_path = Path(args.out)
+    requirements = build_requirements(xml_path)
+    requirements.append("numpy")
+
+    out_path.write_text("\n".join(requirements) + "\n", encoding="utf-8")
+
+
+if __name__ == "__main__":
+    main()