From d570c3a6b525a64780d8a8e616bb052c029bcf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Gar=C3=A7on?= Date: Sat, 22 Feb 2020 00:18:19 +0100 Subject: [PATCH 1/2] Update ikos version to 3.0 --- Dockerfile | 14 +++++++------- README.md | 7 ++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3be65a6..d904b4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,19 +6,19 @@ FROM ubuntu:19.04 AS base ARG njobs=2 ARG build_type=Release -ARG IKOS_VERSION=v2.2 +ARG IKOS_VERSION=v3.0 WORKDIR /root/ikos # Upgrade RUN apt-get update -y \ - && echo "deb http://apt.llvm.org/disco/ llvm-toolchain-disco-8 main" >> /etc/apt/sources.list \ + && echo "deb http://apt.llvm.org/disco/ llvm-toolchain-disco-9 main" >> /etc/apt/sources.list \ && apt-get install -y wget gnupg \ && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ && apt-get update -y \ - && apt-get install -y gcc g++ cmake libgmp-dev libboost-dev \ - libboost-filesystem-dev libboost-test-dev python python-pygments \ - libsqlite3-dev libz-dev libedit-dev llvm-8 llvm-8-dev llvm-8-tools clang-8 \ + && apt-get install -y gcc g++ cmake libgmp-dev libboost-dev libtbb-dev \ + libboost-filesystem-dev libboost-test-dev libboost-thread-dev python python-pygments \ + libsqlite3-dev libz-dev libedit-dev llvm-9 llvm-9-dev llvm-9-tools clang-9 \ git \ && git clone --single-branch https://github.com/NASA-SW-VnV/ikos.git . \ && git checkout tags/${IKOS_VERSION} \ @@ -30,7 +30,7 @@ ENV MAKEFLAGS "-j$njobs" RUN cmake \ -DCMAKE_INSTALL_PREFIX="/opt/ikos" \ -DCMAKE_BUILD_TYPE="$build_type" \ - -DLLVM_CONFIG_EXECUTABLE="/usr/lib/llvm-8/bin/llvm-config" \ + -DLLVM_CONFIG_EXECUTABLE="/usr/lib/llvm-9/bin/llvm-config" \ .. \ && make \ && make install \ @@ -46,7 +46,7 @@ COPY --from=base /opt/ikos /opt/ikos RUN apt-get update -y && apt-get install -y \ python \ - clang-8 \ + clang-9 \ libboost-filesystem-dev \ libgmp-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/README.md b/README.md index afdf3b8..36a1be5 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,9 @@ Here is the versions matrix of the image: | TAG | IKOS VERSION | BASE IMAGE | |:------------------------------------------------------:|:------------------------------------------------------------:|:------------------------------------------------------:| -| [latest](https://hub.docker.com/r/facthunder/ikos) | [2.2](https://github.com/NASA-SW-VnV/ikos/releases/tag/v2.2) | [ubuntu:19.04](https://hub.docker.com/_/ubuntu) | -| [2.2](https://hub.docker.com/r/facthunder/ikos) | [2.2](https://github.com/NASA-SW-VnV/ikos/releases/tag/v2.2) | [ubuntu:19.04](https://hub.docker.com/_/ubuntu) | +| [latest](https://hub.docker.com/r/facthunder/ikos) | [3.0](https://github.com/NASA-SW-VnV/ikos/releases/tag/v3.0) | [ubuntu:19.04](https://hub.docker.com/_/ubuntu) | +| [3.0](https://hub.docker.com/r/facthunder/ikos) | [3.0](https://github.com/NASA-SW-VnV/ikos/releases/tag/v3.0) | [ubuntu:19.04](https://hub.docker.com/_/ubuntu) | +| [2.2](https://hub.docker.com/r/facthunder/ikos) | [2.2](https://github.com/NASA-SW-VnV/ikos/releases/tag/v2.2) | [ubuntu:19.04](https://hub.docker.com/_/ubuntu) | ### How to contribute @@ -25,6 +26,6 @@ If you experienced a problem with the plugin please open an issue. Inside this i If you want to do a PR, please put inside of it the reason of this pull request. If this pull request fix an issue please insert the number of the issue or explain inside of the PR how to reproduce this issue. ### License -Copyright 2019 Facthunder. +Copyright 2020 Facthunder. Licensed under the [GNU General Public License, Version 3.0](https://www.gnu.org/licenses/gpl.txt) From cd0e98bc46a0ac4ebe136251e0cf01ec54008ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Gar=C3=A7on?= Date: Mon, 20 Apr 2020 01:02:52 +0200 Subject: [PATCH 2/2] Use Ubuntu 19.10 --- Dockerfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d904b4f..455beba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # BUILD STAGE #------------------------------# -FROM ubuntu:19.04 AS base +FROM ubuntu:19.10 AS base ARG njobs=2 ARG build_type=Release @@ -40,7 +40,7 @@ RUN cmake \ # FINAL STAGE #------------------------------# -FROM ubuntu:19.04 +FROM ubuntu:19.10 COPY --from=base /opt/ikos /opt/ikos diff --git a/README.md b/README.md index 36a1be5..c2352ff 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Here is the versions matrix of the image: | TAG | IKOS VERSION | BASE IMAGE | |:------------------------------------------------------:|:------------------------------------------------------------:|:------------------------------------------------------:| -| [latest](https://hub.docker.com/r/facthunder/ikos) | [3.0](https://github.com/NASA-SW-VnV/ikos/releases/tag/v3.0) | [ubuntu:19.04](https://hub.docker.com/_/ubuntu) | -| [3.0](https://hub.docker.com/r/facthunder/ikos) | [3.0](https://github.com/NASA-SW-VnV/ikos/releases/tag/v3.0) | [ubuntu:19.04](https://hub.docker.com/_/ubuntu) | +| [latest](https://hub.docker.com/r/facthunder/ikos) | [3.0](https://github.com/NASA-SW-VnV/ikos/releases/tag/v3.0) | [ubuntu:19.10](https://hub.docker.com/_/ubuntu) | +| [3.0](https://hub.docker.com/r/facthunder/ikos) | [3.0](https://github.com/NASA-SW-VnV/ikos/releases/tag/v3.0) | [ubuntu:19.10](https://hub.docker.com/_/ubuntu) | | [2.2](https://hub.docker.com/r/facthunder/ikos) | [2.2](https://github.com/NASA-SW-VnV/ikos/releases/tag/v2.2) | [ubuntu:19.04](https://hub.docker.com/_/ubuntu) |