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

Author: pcaspers

Docker/Dockerfile-multistage

@@ -1,34 +1,12 @@
 ARG debian_tag
 
-# boost
-
-FROM debian:${debian_tag} as boost
-
-ARG boost_tag
-ARG boost_dir
-ARG boost_variant
-ARG num_cores
-
-RUN apt-get update && apt-get upgrade -y \
- && apt-get install -f -y build-essential wget libbz2-dev zlib1g-dev
-
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/${boost_tag}/source/boost_${boost_dir}.tar.gz
-
-RUN tar xfz boost_${boost_dir}.tar.gz \
-    && cd boost_${boost_dir} \
-    && ./bootstrap.sh \
-    && ./b2 --without-python -j ${num_cores} link=shared runtime-link=shared variant=${boost_variant} install
-
 # ore build
 
 FROM debian:${debian_tag} as orebuild
 
 ARG num_cores
 ARG cmake_build_type
 
-COPY --from=boost /usr/local/include/boost /usr/local/include/boost
-COPY --from=boost /usr/local/lib/libboost* /usr/local/lib
-
 COPY CMakeLists.txt /ore/CMakeLists.txt
 COPY .clang-format /ore/.clang-format
 COPY .gitignore /ore/.gitignore
@@ -54,7 +32,7 @@ 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 opencl-headers ocl-icd-opencl-dev
+ && 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 \

Docker/docker-compose-multistage.yml

@@ -8,7 +8,5 @@ services:
       dockerfile: Docker/Dockerfile-multistage
       args:
         - debian_tag=${DEBIAN_TAG}
-        - boost_tag=${BOOST_TAG}
-        - boost_dir=${BOOST_DIR}
-        - boost_variant=${BOOST_VARIANT}
         - num_cores=${NUM_CORES}
+        - cmake_build_type=${CMAKE_BUILD_TYPE}