Merge branch 'master' of gitlab.acadiasoft.net:qs/ore

Author: pcaspers

Docker/.env

@@ -1,6 +1,18 @@
-TAG=latest
 DEBIAN_TAG=11.7
+
+# it's recommended to include CMAKE_BUILD_TYPE and BOOST_VARIANT in QL_TAG, ORE_TAG, BOOST_TAG
+# to distinguish a release build from a debug build
+
 QL_TAG=1.30_00d2fced87
+ORE_TAG=latest
 BOOST_TAG=1.78.0
 BOOST_DIR=1_78_0
+
+# debug or release
+
+BOOST_VARIANT=release
+
+# Release, RelWithDebInfo, Debug
+
+CMAKE_BUILD_TYPE=Release
 NUM_CORES=16

Docker/Dockerfile-Boost-Debug

@@ -1,5 +1,6 @@
 # syntax = nexus3.acadiasoft.net:4445/docker/dockerfile:experimental
 ARG quantlib_version=${QL_TAG}
+ARG cmake_build_type=${CMAKE_BUILD_TYPE}
 FROM env_quantlib:${quantlib_version}
 
 MAINTAINER Quaternion Risk Management
@@ -27,7 +28,7 @@ RUN cd /ore \
   && find -regex ".*\.\(sh\|in\|ac\|am\)" -exec dos2unix {} ';' \
   && cp Docker/CMakeLists_ORE.txt CMakeLists.txt \
   && mkdir -p build.ore && cd build.ore \
-  && cmake .. -DORE_BUILD_DOC=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-mavx2" -DORE_ENABLE_PARALLEL_UNIT_TEST_RUNNER=ON -DORE_USE_ZLIB=ON
+  && cmake .. -DORE_BUILD_DOC=ON -DCMAKE_BUILD_TYPE=${cmake_build_type} -DCMAKE_CXX_FLAGS="-mavx2" -DORE_ENABLE_PARALLEL_UNIT_TEST_RUNNER=ON -DORE_USE_ZLIB=ON -D ORE_ENABLE_OPENCL=ON
 
 WORKDIR /ore/build.ore
 RUN --mount=type=cache,target=/ccache/ make -j ${num_cores} \

Docker/Dockerfile-ORE

@@ -1,5 +1,6 @@
 ARG ore_version=latest
 ARG test_tag=latest
+ARG cmake_build_type=Release
 
 FROM env_ore:${ore_version} as env_ore
 FROM env_ore_test:${test_tag}

Docker/Dockerfile-ORE-App

@@ -1,5 +1,6 @@
 # syntax = nexus3.acadiasoft.net:4445/docker/dockerfile:experimental
 ARG boost_version=latest
+ARG boost_variant=release
 FROM build_env_boost:${boost_version}
 
 MAINTAINER Quaternion Risk Management
@@ -8,6 +9,9 @@ LABEL Description="Build QuantLib and add to the Boost build environment"
 # Argument for number of cores to use while building
 ARG num_cores
 
+# Argument that chooses cmake build type
+ARG cmake_build_type
+
 # Exclusions are performed by .dockerignore
 COPY QuantLib /ore/QuantLib
 
@@ -23,7 +27,7 @@ ENV CCACHE_DIR="/ccache"
 RUN cd /ore/QuantLib \
   && find -regex ".*\.\(sh\|in\|ac\|am\)" -exec dos2unix {} ';' \
   && mkdir -p build.ql && cd build.ql \
-  && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_FLAGS="-D BOOST_ENABLE_ASSERT_HANDLER -mavx2" -DQL_ENABLE_SESSIONS=ON -DQL_ENABLE_PARALLEL_UNIT_TEST_RUNNER=ON
+  && cmake .. -DCMAKE_BUILD_TYPE=${cmake_build_type} -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_FLAGS="-D BOOST_ENABLE_ASSERT_HANDLER -mavx2" -DQL_ENABLE_SESSIONS=ON -DQL_ENABLE_PARALLEL_UNIT_TEST_RUNNER=ON
 
 WORKDIR /ore/QuantLib/build.ql
 RUN --mount=type=cache,target=/ccache/ make -j ${num_cores} \

Docker/Dockerfile-ORE-Debug

@@ -0,0 +1,58 @@
+ARG debian_tag
+
+# ore build
+
+FROM debian:${debian_tag} as orebuild
+
+ARG num_cores
+ARG cmake_build_type
+
+COPY CMakeLists.txt /ore/CMakeLists.txt
+COPY .clang-format /ore/.clang-format
+COPY .gitignore /ore/.gitignore
+COPY CMakePresets.json /ore/CMakePresets.json
+COPY News.txt /ore/News.txt
+COPY README.md /ore/README.md
+COPY license.txt /ore/license.txt
+COPY licenseheader.txt /ore/licenseheader.txt
+COPY ore.props /ore/ore.props
+COPY runCmakeVS.cmd /ore/runCmakeVS.cmd
+COPY QuantLib /ore/QuantLib
+COPY QuantExt /ore/QuantExt
+COPY OREData /ore/OREData
+COPY OREAnalytics /ore/OREAnalytics
+COPY App /ore/App
+COPY ThirdPartyLibs /ore/ThirdPartyLibs
+COPY ORETest /ore/ORETest
+COPY cmake /ore/cmake
+COPY Docker /ore/Docker
+COPY Docs ore/Docs
+COPY Examples ore/Examples
+COPY Tools ore/Tools
+COPY xsd ore/xsd
+
+RUN apt-get update && apt-get upgrade -y \
+ && apt-get install -f -y build-essential libbz2-dev cmake ninja-build zlib1g-dev libboost-all-dev opencl-headers ocl-icd-opencl-dev
+
+RUN cd / \
+  && mkdir -p build_ore && cd build_ore \
+  && cmake /ore -GNinja -DCMAKE_BUILD_TYPE=${cmake_build_type} -DORE_BUILD_DOC=OFF -DORE_USE_ZLIB=ON -DQL_ENABLE_SESSIONS=ON -DORE_ENABLE_OPENCL=ON
+
+RUN cd /build_ore \
+  && cmake --build . -- -j${num_cores} install
+
+RUN ldconfig
+
+# ore
+
+FROM debian:${debian_tag} as ore
+
+COPY --from=orebuild /usr/local/include /usr/local/include
+COPY --from=orebuild /usr/local/lib/ /usr/local/lib
+COPY --from=orebuild /usr/local/bin/ /usr/local/bin
+COPY --from=orebuild /ore /ore
+COPY --from=orebuild /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu
+
+RUN ldconfig
+
+CMD bash

Docker/Dockerfile-QuantLib

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker-compose --env-file Docker/.env -f Docker/docker-compose-multistage.yml build