Docker updates

OpenSourceRisk · May 28, 2019 · d400c6c · d400c6c
1 parent c66d0cf
commit d400c6c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Docker/Dockerfile-Boost b/Docker/Dockerfile-Boost
@@ -5,7 +5,7 @@ MAINTAINER Quaternion Risk Management
 LABEL Description="Provide a base environment for building in C++ with Boost"
 
 RUN apt-get update \
- && apt-get install -y build-essential wget libbz2-dev autoconf libtool dos2unix \
+ && apt-get install -y build-essential wget libbz2-dev autoconf libtool dos2unix cmake\
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
@@ -21,4 +21,4 @@ RUN wget http://downloads.sourceforge.net/project/boost/boost/${boost_version}/$
     && ./b2 --without-python -j 4 link=shared runtime-link=shared install \
     && cd .. && rm -rf ${boost_dir} && ldconfig
 
-CMD bash
+CMD bash
diff --git a/Docker/Dockerfile-ORE b/Docker/Dockerfile-ORE
@@ -20,29 +20,29 @@ RUN cd /ore \
   && find -regex ".*\.\(sh\|in\|ac\|am\)" -exec dos2unix {} ';' \
   && cd QuantExt \
   && ./autogen.sh \
-  && ./configure --disable-static CXXFLAGS=-O2 \
+  && ./configure --enable-static CXXFLAGS=-O2 \
   && cd qle \
   && make -j ${num_cores} \
   && make install \
   && cd ../../OREData \
   && ./autogen.sh \
-  && ./configure --disable-static CXXFLAGS="-O2 -std=c++11" \
+  && ./configure --enable-static CXXFLAGS="-O2 -std=c++11" \
   && cd ored \
   && make -j ${num_cores} \
   && make install \
   && cd ../../OREAnalytics \
   && ./autogen.sh \
-  && ./configure --disable-static CXXFLAGS="-O2 -std=c++11" \
+  && ./configure --enable-static CXXFLAGS="-O2 -std=c++11" \
   && cd orea \
   && make -j ${num_cores} \
   && make install \
   && ldconfig \
   && cd ../../App \
   && ./autogen.sh \
-  && ./configure --disable-static CXXFLAGS="-O2 -std=c++11" \
+  && ./configure --enable-static CXXFLAGS="-O2 -std=c++11" \
   && make -j ${num_cores} \
   && make install \
   && cd / \
   && rm -rf ore
 
-CMD bash
+CMD bash
diff --git a/Docker/Dockerfile-QuantLib b/Docker/Dockerfile-QuantLib
@@ -15,7 +15,7 @@ COPY QuantLib /ore/QuantLib
 RUN cd /ore/QuantLib \
   && find -regex ".*\.\(sh\|in\|ac\|am\)" -exec dos2unix {} ';' \
   && ./autogen.sh \
-  && ./configure --disable-static CXXFLAGS=-O2 \
+  && ./configure --enable-static CXXFLAGS=-O2 \
   && cd ql \
   && make -j ${num_cores} \
   && make install \

diff --git a/Docker/docker-compose-boost.yml b/Docker/docker-compose-boost.yml
@@ -2,10 +2,10 @@ version: '3'
 
 services:
   build_env_boost:
-    image: build_env_boost:1.63.0
+    image: build_env_boost:1.65.1
     build:
       context: .
       dockerfile: Dockerfile-Boost
       args:
-        - boost_version=1.63.0
-        - boost_dir=boost_1_63_0
+        - boost_version=1.65.1
+        - boost_dir=boost_1_65_1
diff --git a/Docker/docker-compose-ore.yml b/Docker/docker-compose-ore.yml
@@ -7,4 +7,4 @@ services:
       context: ../
       dockerfile: Docker/Dockerfile-ORE
       args:
-        - quantlib_version=1.11
+        - quantlib_version=1.13
diff --git a/Docker/docker-compose-quantlib.yml b/Docker/docker-compose-quantlib.yml
@@ -2,9 +2,9 @@ version: '3'
 
 services:
   env_quantlib:
-    image: env_quantlib:1.11
+    image: env_quantlib:1.14
     build:
       context: ../
       dockerfile: Docker/Dockerfile-QuantLib
       args:
-        - boost_version=1.63.0
+        - boost_version=1.65.1