Fixing Docker build

meelgroup · Apr 25, 2020 · dd9654a · dd9654a
1 parent 3a5d2cf
commit dd9654a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -338,8 +338,11 @@ include_directories(${M4RI_INCLUDE_DIRS})
 find_package(BRiAl REQUIRED)
 include_directories(${BRiAl_INCLUDE_DIRS})
 
-add_subdirectory(${PROJECT_SOURCE_DIR}/utils/cnf-utils)
 
+option(TESTING "Enable testing" OFF)
+if (TESTING)
+    add_subdirectory(${PROJECT_SOURCE_DIR}/utils/cnf-utils)
+endif()
 
 # headers, install locations, etc
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,9 @@
-FROM ubuntu:19.04 as builder
+FROM ubuntu:20.04 as builder
 
 LABEL maintainer="Mate Soos"
 LABEL version="1.0"
 LABEL Description="Bosphorus"
+ENV DEBIAN_FRONTEND=noninteractive
 
 # get curl, etc
 RUN apt-get update
@@ -33,11 +34,11 @@ RUN make install
 
 # build CMS
 WORKDIR /
-RUN wget https://github.com/msoos/cryptominisat/archive/5.6.5.tar.gz \
-    && tar -xvf 5.6.5.tar.gz
-WORKDIR /cryptominisat-5.6.5
+RUN wget https://github.com/msoos/cryptominisat/archive/5.7.0.tar.gz \
+    && tar -xvf 5.7.0.tar.gz
+WORKDIR /cryptominisat-5.7.0
 RUN mkdir build
-WORKDIR /cryptominisat-5.6.5/build
+WORKDIR /cryptominisat-5.7.0/build
 RUN cmake -DSTATICCOMPILE=ON .. \
     && make -j2 \
     && make install \