aboutsummaryrefslogtreecommitdiff
path: root/infra/base-images/base-clang
diff options
context:
space:
mode:
authorOliver Chang <oliverchang@users.noreply.github.com>2020-07-31 16:55:30 +1000
committerGitHub <noreply@github.com>2020-07-31 16:55:30 +1000
commit95e66c619ea5d03b35d940e1d222927e3361bf88 (patch)
treed8ce9bcbe09de2c2235eb4abf00fbb71d4578f65 /infra/base-images/base-clang
parent8e4c7b92fd53b17b0f8f572cbda1e930370b39d6 (diff)
downloadoss-fuzz-95e66c619ea5d03b35d940e1d222927e3361bf88.tar.gz
Move cmake install to base-clang. (#4240)
Clang now needs a newer cmake to build.
Diffstat (limited to 'infra/base-images/base-clang')
-rw-r--r--infra/base-images/base-clang/Dockerfile9
1 files changed, 9 insertions, 0 deletions
diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile
index df8376d2a..853a374b0 100644
--- a/infra/base-images/base-clang/Dockerfile
+++ b/infra/base-images/base-clang/Dockerfile
@@ -18,6 +18,15 @@
FROM gcr.io/oss-fuzz-base/base-image
+# Install newer cmake.
+ENV CMAKE_VERSION 3.18.1
+RUN apt-get update && apt-get install -y wget sudo && \
+ wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.sh && \
+ chmod +x cmake-$CMAKE_VERSION-Linux-x86_64.sh && \
+ ./cmake-$CMAKE_VERSION-Linux-x86_64.sh --skip-license --prefix="/usr/local" && \
+ rm cmake-$CMAKE_VERSION-Linux-x86_64.sh && \
+ SUDO_FORCE_REMOVE=yes apt-get remove --purge -y wget sudo
+
COPY checkout_build_install_llvm.sh /root/
# Keep all steps in the same script to decrease the number of intermediate
# layes in docker file.