about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorMartin Nowack <m.nowack@imperial.ac.uk>2023-02-23 22:22:52 +0000
committerCristian Cadar <c.cadar@imperial.ac.uk>2023-03-17 22:38:16 +0000
commitc0cdde6d0fc3c8423dce71cdc7245cdb7fef8da8 (patch)
treedf540be1866dc296370b9a1406ef722766b18688
parent2add9acfc9f2b0b01ea7c45c81494b7c19f696c2 (diff)
downloadklee-c0cdde6d0fc3c8423dce71cdc7245cdb7fef8da8.tar.gz
Update Docker build components
* Use Ubuntu 22.04
* Use newer TCMalloc 2.9.1
* use Z3 4.8.15
* Use SQLite 3400100
-rw-r--r--Dockerfile20
1 files changed, 12 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile
index 6926b133..a10ce3c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM klee/llvm:110_O_D_A_ubuntu_bionic-20200807 as llvm_base
-FROM klee/gtest:1.11.0_ubuntu_bionic-20200807 as gtest_base
-FROM klee/uclibc:klee_uclibc_v1.3_110_ubuntu_bionic-20200807 as uclibc_base
-FROM klee/tcmalloc:2.9.1_ubuntu_bionic-20200807 as tcmalloc_base
-FROM klee/stp:2.3.3_ubuntu_bionic-20200807 as stp_base
-FROM klee/z3:4.8.15_ubuntu_bionic-20200807 as z3_base
-FROM klee/libcxx:110_ubuntu_bionic-20200807 as libcxx_base
+FROM klee/llvm:110_O_D_A_ubuntu_jammy-20230126 as llvm_base
+FROM klee/gtest:1.11.0_ubuntu_jammy-20230126 as gtest_base
+FROM klee/uclibc:klee_uclibc_v1.3_110_ubuntu_jammy-20230126 as uclibc_base
+FROM klee/tcmalloc:2.9.1_ubuntu_jammy-20230126 as tcmalloc_base
+FROM klee/stp:2.3.3_ubuntu_jammy-20230126 as stp_base
+FROM klee/z3:4.8.15_ubuntu_jammy-20230126 as z3_base
+FROM klee/libcxx:110_ubuntu_jammy-20230126 as libcxx_base
+FROM klee/sqlite:3400100_ubuntu_jammy-20230126 as sqlite3_base
 FROM llvm_base as intermediate
 COPY --from=gtest_base /tmp /tmp/
 COPY --from=uclibc_base /tmp /tmp/
@@ -12,6 +13,7 @@ COPY --from=tcmalloc_base /tmp /tmp/
 COPY --from=stp_base /tmp /tmp/
 COPY --from=z3_base /tmp /tmp/
 COPY --from=libcxx_base /tmp /tmp/
+COPY --from=sqlite3_base /tmp /tmp/
 ENV COVERAGE=0
 ENV USE_TCMALLOC=1
 ENV BASE=/tmp
@@ -31,9 +33,9 @@ ENV MINISAT_VERSION=master
 ENV Z3_VERSION=4.8.15
 ENV USE_LIBCXX=1
 ENV KLEE_RUNTIME_BUILD="Debug+Asserts"
+ENV SQLITE_VERSION=3400100
 LABEL maintainer="KLEE Developers"
 
-
 # TODO remove adding sudo package
 # Create ``klee`` user for container with password ``klee``.
 # and give it password-less sudo access (temporarily so we can use the CI scripts)
@@ -56,6 +58,8 @@ RUN /tmp/klee_src/scripts/build/build.sh --debug --install-system-deps klee && p
 
 ENV PATH="$PATH:/tmp/llvm-110-install_O_D_A/bin:/home/klee/klee_build/bin:/home/klee/.local/bin"
 ENV BASE=/tmp
+# Add path to local LLVM installation - let system install precede local install
+RUN /bin/bash -c 'echo "export \"PATH=$PATH:$(cd ${BASE}/llvm-*-install*/bin/ && pwd)\" >> /home/klee/.bashrc"'
 
 # Add KLEE header files to system standard include folder
 RUN sudo /bin/bash -c 'ln -s /tmp/klee_src/include/klee /usr/include/'