Skip to content

Commit a54a277

Browse files
pcaspersjenkins
authored andcommitted
QPR-12005 do not include boost variant in image name
1 parent 4a35ac0 commit a54a277

4 files changed

Lines changed: 14 additions & 7 deletions

File tree

Docker/.env

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
DEBIAN_TAG=11.7
2-
# it's recommended to include CMAKE_BUILD_TYPE in the QL and ORE tags if the latter is not 'Release'
2+
#
3+
# it's recommended to include CMAKE_BUILD_TYPE and BOOST_VARIANT in QL_TAG, ORE_TAG, BOOST_TAG
4+
# to distinguish a release build from a debug build
5+
#
36
QL_TAG=1.30_00d2fced87
4-
ORE_TAG=latest_debug
7+
ORE_TAG=latest
58
BOOST_TAG=1.78.0
69
BOOST_DIR=1_78_0
10+
#
711
# debug or release
8-
BOOST_VARIANT=debug
12+
#
13+
BOOST_VARIANT=release
14+
#
915
# Release, RelWithDebInfo, Debug
10-
CMAKE_BUILD_TYPE=RelWithDebInfo
16+
#
17+
CMAKE_BUILD_TYPE=Release
1118
NUM_CORES=6

Docker/Dockerfile-ORE-App

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ore_version=latest
22
ARG test_tag=latest
3-
ARG cmake_build_type
3+
ARG cmake_build_type=Release
44

55
FROM env_ore:${ore_version} as env_ore
66
FROM env_ore_test:${test_tag}

Docker/Dockerfile-QuantLib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax = nexus3.acadiasoft.net:4445/docker/dockerfile:experimental
22
ARG boost_version=latest
33
ARG boost_variant=release
4-
FROM build_env_boost_${boost_variant}:${boost_version}
4+
FROM build_env_boost:${boost_version}
55

66
MAINTAINER Quaternion Risk Management
77
LABEL Description="Build QuantLib and add to the Boost build environment"

Docker/docker-compose-boost.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
build_env_boost:
5-
image: build_env_boost_${BOOST_VARIANT}:${BOOST_TAG}
5+
image: build_env_boost:${BOOST_TAG}
66
build:
77
context: .
88
dockerfile: Dockerfile-Boost

0 commit comments

Comments
 (0)