From 51d66e8cba5129a457ba9ef45aa882fd18c109ac Mon Sep 17 00:00:00 2001
From: Martin Nowack <m.nowack@imperial.ac.uk>
Date: Thu, 24 Sep 2020 21:31:35 +0100
Subject: Update Dockerfile to use LLVM 9.0 and newer Ubuntu version

---
 Dockerfile | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 166dd194..eed582ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM klee/llvm:60_O_D_A_ubuntu_bionic-20200112 as llvm_base
-FROM klee/gtest:1.7.0_ubuntu_bionic-20200112 as gtest_base
-FROM klee/uclibc:klee_uclibc_v1.2_60_ubuntu_bionic-20200112 as uclibc_base
-FROM klee/tcmalloc:2.7_ubuntu_bionic-20200112 as tcmalloc_base
-FROM klee/stp:2.3.3_ubuntu_bionic-20200112 as stp_base
-FROM klee/z3:4.8.4_ubuntu_bionic-20200112 as z3_base
-FROM klee/libcxx:60_ubuntu_bionic-20200112 as libcxx_base
+FROM klee/llvm:90_O_D_A_ubuntu_bionic-20200807 as llvm_base
+FROM klee/gtest:1.7.0_ubuntu_bionic-20200807 as gtest_base
+FROM klee/uclibc:klee_uclibc_v1.2_90_ubuntu_bionic-20200807 as uclibc_base
+FROM klee/tcmalloc:2.7_ubuntu_bionic-20200807 as tcmalloc_base
+FROM klee/stp:2.3.3_ubuntu_bionic-20200807 as stp_base
+FROM klee/z3:4.8.4_ubuntu_bionic-20200807 as z3_base
+FROM klee/libcxx:90_ubuntu_bionic-20200807 as libcxx_base
 FROM llvm_base as intermediate
 COPY --from=gtest_base /tmp /tmp/
 COPY --from=uclibc_base /tmp /tmp/
@@ -15,7 +15,7 @@ COPY --from=libcxx_base /tmp /tmp/
 ENV COVERAGE=0
 ENV USE_TCMALLOC=1
 ENV BASE=/tmp
-ENV LLVM_VERSION=6.0
+ENV LLVM_VERSION=9.0
 ENV ENABLE_OPTIMIZED=1
 ENV ENABLE_DEBUG=1
 ENV DISABLE_ASSERTIONS=0
@@ -23,10 +23,8 @@ ENV REQUIRES_RTTI=0
 ENV SOLVERS=STP:Z3
 ENV GTEST_VERSION=1.7.0
 ENV UCLIBC_VERSION=klee_uclibc_v1.2
-ENV LLVM_VERSION=6.0
 ENV TCMALLOC_VERSION=2.7
 ENV SANITIZER_BUILD=
-ENV LLVM_VERSION=6.0
 ENV STP_VERSION=2.3.3
 ENV MINISAT_VERSION=master
 ENV Z3_VERSION=4.8.4
@@ -52,7 +50,7 @@ COPY --chown=klee:klee . /tmp/klee_src/
 RUN /tmp/klee_src/scripts/build/build.sh --debug --install-system-deps klee && chown -R klee:klee /tmp/klee_build* && pip3 install flask wllvm && \
     rm -rf /var/lib/apt/lists/*
 
-ENV PATH="$PATH:/tmp/llvm-60-install_O_D_A/bin:/home/klee/klee_build/bin"
+ENV PATH="$PATH:/tmp/llvm-90-install_O_D_A/bin:/home/klee/klee_build/bin"
 ENV BASE=/tmp
 
 # Add KLEE header files to system standard include folder
-- 
cgit 1.4.1