Merge remote-tracking branch 'origin/master' into gbfredrik_index-replacements

Author: pcaspers

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "QuantLib"]
 	path = QuantLib
-	url = https://github.com/OpenSourceRisk/QuantLib.git
+	url = git@gitlab.acadiasoft.net:qs/quantlib.git
 	branch = master
 	ignore = dirty

Docker/.env

@@ -1,6 +1,18 @@
-TAG=latest
 DEBIAN_TAG=11.7
-QL_TAG=1.30_4274655e
+#
+# 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
 
 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

@@ -11,3 +11,4 @@ services:
         - boost_dir=boost_${BOOST_DIR}
         - num_cores=16
         - debian_tag=${DEBIAN_TAG}
+        - boost_variant=${BOOST_VARIANT}