update dockerfiles

Author: mgroncki

Docker/Dockerfile-ORESWIG

@@ -39,4 +39,7 @@ RUN mkdir oreswig
 RUN mv /swig/OREAnalytics-SWIG/Python/build.release/ORE.py oreswig \
   && mv /swig/OREAnalytics-SWIG/Python/build.release/_ORE.so oreswig 
 
-ENV PYTHONPATH=/oreswig
+ENV PYTHONPATH=/oreswig
+
+WORKDIR /swig/OREAnalytics-SWIG/Python/Examples
+RUN ./runExamples.sh

Docker/Dockerfile-ORESWIG-App

@@ -12,6 +12,8 @@ RUN apt-get update \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
+RUN pip3 install matplotlib pandas nose nose_xunitmp datacompy
+
 WORKDIR /
 RUN mkdir /oreswig
 RUN mkdir /oreswig/pythonlib
@@ -26,14 +28,18 @@ RUN true
 COPY --from=env_ore /usr/local/lib /usr/local/lib
 
 ENV PYTHONPATH=/oreswig/pythonlib
+ENV LD_LIBRARY_PATH=/usr/local/lib
 
 RUN mkdir /oreswig/tests
 
 COPY oreswig/QuantLib-SWIG/Python/test /oreswig/tests/QuantLibTestSuite
+# Delete the init.py otherwise nosetest will not pick up all the tests
+RUN rm oreswig/tests/QuantLibTestSuite/__init__.py
 COPY oreswig/OREAnalytics-SWIG/Python/test /oreswig/tests/ORETestSuite
-COPY oreswig/OREAnalytics-SWIG/Python/Examples /oreswig/examples
-COPY ore/Examples /oreswig/ORE-Examples
-
+COPY oreswig/OREAnalytics-SWIG/Python/Examples /oreswig/example_scripts
+COPY ore/Examples /oreswig/Examples
+COPY ore/Tools /oreswig/Tools
+# Set env variable to run the ore examples with the python interface instead of the executable
 ENV ORE_EXAMPLES_USE_PYTHON=1
 
 CMD bash

Docker/DockerfileRunORE.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-#COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose --env-file ore/Docker/.env -f oreswig/Docker/docker-compose-oreswig.yml build || exit 1
+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose --env-file ore/Docker/.env -f oreswig/Docker/docker-compose-oreswig.yml build || exit 1
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose --env-file ore/Docker/.env -f oreswig/Docker/docker-compose-oreswig-app.yml build || exit 1

OREAnalytics-SWIG/Python/Examples/runExamples.sh

@@ -0,0 +1,4 @@
+#!/bin/sh 
+echo RUN commodityforward.py
+python3 commodityforward.py
+python3 conventions.py

OREAnalytics-SWIG/Python/test/testrunner.py

@@ -6,6 +6,4 @@
 sys.modules["QuantLib"] = ORE
 
 if __name__=="__main__":
-    folder = sys.argv[1]
-    argv = [__file__, "-w ", folder, '--with-xunit']
-    nose.run(argv=argv)
+    nose.run()