From 3e86598bfda9bdd611633ba9006ffa41ee051366 Mon Sep 17 00:00:00 2001 From: Bhargava Shastry Date: Mon, 13 Sep 2021 09:41:45 +0200 Subject: [PATCH] Docker: Update ossfuzz docker image to pull in clang-14. --- .../Dockerfile.ubuntu1604.clang.ossfuzz | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz index 5e32ef9bf..9f2d28271 100644 --- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz +++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz @@ -22,7 +22,7 @@ # (c) 2016-2019 solidity contributors. #------------------------------------------------------------------------------ FROM gcr.io/oss-fuzz-base/base-clang as base -LABEL version="11" +LABEL version="12" ARG DEBIAN_FRONTEND=noninteractive @@ -35,10 +35,11 @@ RUN apt-get update; \ pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4; \ apt-get install -qy python-pip python-sphinx; -# Install cmake 3.14 (minimum requirement is cmake 3.10) -RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.sh; \ - chmod +x cmake-3.14.5-Linux-x86_64.sh; \ - ./cmake-3.14.5-Linux-x86_64.sh --skip-license --prefix="/usr" +# Install cmake 3.21.2 (minimum requirement is cmake 3.10) +RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2-Linux-x86_64.sh; \ + test "$(sha256sum cmake-3.21.2-Linux-x86_64.sh)" = "3310362c6fe4d4b2dc00823835f3d4a7171bbd73deb7d059738494761f1c908c cmake-3.21.2-Linux-x86_64.sh"; \ + chmod +x cmake-3.21.2-Linux-x86_64.sh; \ + ./cmake-3.21.2-Linux-x86_64.sh --skip-license --prefix="/usr" FROM base AS libraries @@ -92,7 +93,7 @@ RUN set -ex; \ # EVMONE RUN set -ex; \ cd /usr/src; \ - git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \ + git clone --branch="v0.8.2" --recurse-submodules https://github.com/ethereum/evmone.git; \ cd evmone; \ mkdir build; \ cd build; \