Remove cmake install from projects. (#3961)

16 files changed, 11 insertions, 102 deletions

diff --git a/projects/envoy/Dockerfile b/projects/envoy/Dockerfile
index b6566595..25732ede 100644
--- a/projects/envoy/Dockerfile
+++ b/projects/envoy/Dockerfile
@@ -34,11 +34,6 @@ RUN apt-get update && apt-get -y install  \
 RUN wget -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v0.0.8/bazelisk-linux-amd64
 RUN chmod +x /usr/local/bin/bazel
 
-# Install cmake
-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/local"
-
 RUN git clone https://github.com/envoyproxy/envoy.git
 WORKDIR $SRC/envoy/
 COPY build.sh $SRC/
diff --git a/projects/esp-v2/Dockerfile b/projects/esp-v2/Dockerfile
index d4e43c12..6ebfac19 100644
--- a/projects/esp-v2/Dockerfile
+++ b/projects/esp-v2/Dockerfile
@@ -36,11 +36,6 @@ RUN apt-get update && apt-get -y install  \
 RUN wget -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v0.0.8/bazelisk-linux-amd64; \
     chmod +x /usr/local/bin/bazel
 
-# Install cmake
-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/local"
-
 RUN git clone --depth 1 https://github.com/GoogleCloudPlatform/esp-v2.git
 WORKDIR $SRC/esp-v2/
 COPY build.sh $SRC/
diff --git a/projects/firestore/build.sh b/projects/firestore/build.sh
index ec9a429a..7ada1b9d 100755
--- a/projects/firestore/build.sh
+++ b/projects/firestore/build.sh
@@ -15,17 +15,7 @@
 #
 ################################################################################
 
-# The cmake version that is available on Ubuntu 16.04 is 3.5.1. While Firestore
-# itself requires cmake 3.5, it depends on leveldb which requires cmake 3.9
-# (https://github.com/google/leveldb/blob/master/CMakeLists.txt#L5).
-# There is an open issue (https://github.com/google/leveldb/issues/607) to
-# lower the required cmake version of leveldb. Therefore, we need to download
-# a newer version of cmake until leveldb lowers the required version or a newer
-# cmake version becomes available in the OSS Fuzz environment.
 cd $WORK
-wget https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.tar.gz
-tar -xzf cmake-3.12.0-Linux-x86_64.tar.gz
-rm cmake-3.12.0-Linux-x86_64.tar.gz
 
 # Disable UBSan vptr since Firestore depends on other libraries that are built
 # with -fno-rtti.
@@ -36,7 +26,7 @@ export CXXFLAGS="$CXXFLAGS -fno-sanitize=vptr"
 # fuzzing library defined in ${LIB_FUZZING_ENGINE}.
 cd $SRC/firebase-ios-sdk
 mkdir build && cd build
-$WORK/cmake-3.12.0-Linux-x86_64/bin/cmake -DFUZZING=ON ..
+cmake -DFUZZING=ON ..
 make -j$(nproc)
 
 # Copy fuzzing targets, dictionaries, and zipped corpora to $OUT.
diff --git a/projects/grok/Dockerfile b/projects/grok/Dockerfile
index 88b4bdda..74aef4da 100644
--- a/projects/grok/Dockerfile
+++ b/projects/grok/Dockerfile
@@ -16,9 +16,8 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER boxerab@gmail.com
-RUN apt-get update && apt-get install -y make wget
-RUN wget --no-check-certificate -qO - https://cmake.org/files/v3.17/cmake-3.17.0-Linux-x86_64.tar.gz | tar -xz
-RUN mv cmake-3.17.0-Linux-x86_64 cmake-install
+RUN apt-get update && apt-get install -y wget
+
 RUN git clone --depth 1 https://github.com/GrokImageCompression/grok.git grok
 RUN git clone --depth 1 https://github.com/GrokImageCompression/grok-test-data.git grok/data
 WORKDIR grok
diff --git a/projects/grok/build.sh b/projects/grok/build.sh
index 7619a487..4ec01fbf 100755
--- a/projects/grok/build.sh
+++ b/projects/grok/build.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 ################################################################################
-export PATH=${SRC}/cmake-install/bin:${PATH}
+
 mkdir build
 cd build
 cmake ..
diff --git a/projects/hermes/Dockerfile b/projects/hermes/Dockerfile
index d88b2cd8..1354e8b1 100644
--- a/projects/hermes/Dockerfile
+++ b/projects/hermes/Dockerfile
@@ -19,10 +19,7 @@ MAINTAINER neildhar@fb.com
 RUN apt-get update && \
     apt-get install -y make autoconf automake libtool wget libicu-dev \
     ninja-build python zip libreadline-dev libatomic-ops-dev
-# Install cmake
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.16.6/cmake-3.16.6-Linux-x86_64.sh; \
-    chmod +x cmake-3.16.6-Linux-x86_64.sh; \
-    ./cmake-3.16.6-Linux-x86_64.sh --skip-license --prefix="/usr/local"
+
 RUN git clone https://github.com/facebook/hermes.git
 WORKDIR hermes
 COPY build.sh $SRC/
diff --git a/projects/iroha/Dockerfile b/projects/iroha/Dockerfile
index 11855760..b4c0555a 100644
--- a/projects/iroha/Dockerfile
+++ b/projects/iroha/Dockerfile
@@ -22,11 +22,7 @@ RUN set -e; \
     apt-get -y --no-install-recommends install libicu-dev \
         apt-utils git curl wget unzip tar; \
     apt-get -y clean
-     
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.4/cmake-3.14.4-Linux-x86_64.tar.gz && tar -xzvf cmake-3.14.4-Linux-x86_64.tar.gz && cp -a cmake-3.14.4-Linux-x86_64/bin/. /usr/bin/ && cp -a cmake-3.14.4-Linux-x86_64/share/. /usr/share/
-  
-  
-# Get *your* source code here.
+
 RUN git clone --depth 1 --single-branch --branch master https://github.com/hyperledger/iroha.git
 
 WORKDIR iroha
diff --git a/projects/jsc/Dockerfile b/projects/jsc/Dockerfile
index 3b773006..b5128912 100644
--- a/projects/jsc/Dockerfile
+++ b/projects/jsc/Dockerfile
@@ -17,10 +17,7 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER ochang@google.com
 RUN apt-get update && apt-get install -y make autoconf automake libtool python ruby ninja-build bison flex gperf wget
-# Requires newer CMake than available in Ubuntu 16.04
-RUN wget -q -O - https://github.com/Kitware/CMake/releases/download/v3.14.4/cmake-3.14.4-Linux-x86_64.sh > /tmp/install_cmake.sh && \
-    cd /usr && bash /tmp/install_cmake.sh -- --skip-license && \
-    rm /tmp/install_cmake.sh
+
 RUN git clone --depth 1 git://git.webkit.org/WebKit.git
 RUN wget https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.tgz && tar xzvf icu4c-66_1-src.tgz
 WORKDIR WebKit
diff --git a/projects/jsoncpp/Dockerfile b/projects/jsoncpp/Dockerfile
index c649d70a..f381f7a7 100644
--- a/projects/jsoncpp/Dockerfile
+++ b/projects/jsoncpp/Dockerfile
@@ -15,12 +15,7 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-RUN apt-get update && apt-get install -y build-essential make curl wget
-
-# Install latest cmake.
-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/local"
+RUN apt-get update && apt-get install -y curl wget
 
 RUN git clone --depth 1 https://github.com/open-source-parsers/jsoncpp
 WORKDIR jsoncpp
diff --git a/projects/libical/Dockerfile b/projects/libical/Dockerfile
index 9679108c..846fed56 100644
--- a/projects/libical/Dockerfile
+++ b/projects/libical/Dockerfile
@@ -16,11 +16,6 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER tsdgeos@gmail.com
-RUN apt-get update && apt-get install --yes cmake
-
-# libical requires cmake 3.11 whereas Ubuntu 16.04 only has 3.5.1
-ADD https://github.com/Kitware/CMake/releases/download/v3.14.3/cmake-3.14.3-Linux-x86_64.tar.gz $WORK
-RUN cd $WORK && tar -xzf cmake-3.14.3-Linux-x86_64.tar.gz && rm cmake-3.14.3-Linux-x86_64.tar.gz
 
 RUN git clone --depth 1 https://github.com/libical/libical.git
 COPY build.sh $SRC
diff --git a/projects/libical/build.sh b/projects/libical/build.sh
index 9af13255..830a55b1 100644
--- a/projects/libical/build.sh
+++ b/projects/libical/build.sh
@@ -1,4 +1,4 @@
-$WORK/cmake-3.14.3-Linux-x86_64/bin/cmake . -DSTATIC_ONLY=ON -DICAL_GLIB=False
+cmake . -DSTATIC_ONLY=ON -DICAL_GLIB=False
 make install -j$(nproc)
 
 $CXX $CXXFLAGS -std=c++11 $SRC/libical_fuzzer.cc $LIB_FUZZING_ENGINE /usr/local/lib/libical.a -o $OUT/libical_fuzzer
diff --git a/projects/opendnp3/Dockerfile b/projects/opendnp3/Dockerfile
index c619c9ce..b022308b 100644
--- a/projects/opendnp3/Dockerfile
+++ b/projects/opendnp3/Dockerfile
@@ -17,14 +17,7 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER info@automatak.com
 RUN apt-get update && apt-get install -y make wget tshark
-# The CMake version that is available on Ubuntu 16.04 is 3.5.1. OpenDNP3
-# needs CMake 3.8 or higher, because of the C# bindings. Therefore, we
-# manually install a modern CMake until the OSS Fuzz environment updates
-# to a more recent Ubuntu.
-# This section was taken from JSC Dockerfile
-RUN wget -q -O - https://github.com/Kitware/CMake/releases/download/v3.14.4/cmake-3.14.4-Linux-x86_64.sh > /tmp/install_cmake.sh && \
-    cd /usr && bash /tmp/install_cmake.sh -- --skip-license && \
-    rm /tmp/install_cmake.sh
+
 RUN git clone --recursive -b release-2.x --depth 1 https://github.com/dnp3/opendnp3.git opendnp3
 WORKDIR opendnp3
 COPY build.sh $SRC/
diff --git a/projects/osquery/Dockerfile b/projects/osquery/Dockerfile
index 58e73df8..9118fb64 100755
--- a/projects/osquery/Dockerfile
+++ b/projects/osquery/Dockerfile
@@ -19,23 +19,6 @@ MAINTAINER theopolis@osquery.io
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends python python3 bison flex make wget xz-utils libunwind-dev
 
-# Install specific git version.
-RUN export GIT_VER=2.21.0 \
- && apt-get install -y libz-dev gettext nano libssl-dev autoconf libcurl4-openssl-dev \
- && wget https://github.com/git/git/archive/v$GIT_VER.tar.gz \
- && tar xf v$GIT_VER.tar.gz \
- && cd git-$GIT_VER/ \
- && make configure \
- && ./configure --with-openssl \
- && make -j4 install \
- && cd .. \
- && rm -rf v$GIT_VER.tar.gz git-$GIT_VER
-
-# Installer newer cmake
-RUN wget -q https://github.com/Kitware/CMake/releases/download/v3.14.6/cmake-3.14.6-Linux-x86_64.tar.gz \
- && tar xf cmake-3.14.6-Linux-x86_64.tar.gz -C /usr/local --strip 1 \
- && rm cmake-3.14.6-Linux-x86_64.tar.gz
-
 RUN git clone --depth 1 https://github.com/osquery/osquery osquery
 
 WORKDIR osquery
diff --git a/projects/proxygen/Dockerfile b/projects/proxygen/Dockerfile
index d1f7155b..ca86b660 100644
--- a/projects/proxygen/Dockerfile
+++ b/projects/proxygen/Dockerfile
@@ -31,20 +31,6 @@ RUN apt-get update && \
     python \
     python-dev
 
-# We need a newer version of CMake than is available in the base builder image
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.15.2/cmake-3.15.2.tar.gz && \
-    tar xzf cmake-3.15.2.tar.gz && \
-    cd cmake-3.15.2 && \
-    export CC=clang && \
-    export CXX=clang++ && \
-    CXXFLAGS="" && \
-    CFLAGS="" && \
-    ./bootstrap && \
-    make -j$(nproc) && \
-    make install && \
-    cd .. && \
-    rm -rf cmake-3.15.2
-
 # Install and build boost from source so we can have it use libc++
 RUN wget https://sourceforge.net/projects/boost/files/boost/1.70.0/boost_1_70_0.tar.gz && \
     tar xzf boost_1_70_0.tar.gz && \
diff --git a/projects/rdkit/Dockerfile b/projects/rdkit/Dockerfile
index 2f774633..59bb2ddd 100644
--- a/projects/rdkit/Dockerfile
+++ b/projects/rdkit/Dockerfile
@@ -16,13 +16,7 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER greg.landrum@gmail.com
-RUN dpkg --add-architecture i386 && \
-  apt-get update && apt-get install -y make wget cmake libeigen3-dev
-
-# Install latest cmake
-RUN wget --quiet 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/local"
+RUN apt-get update && apt-get install -y wget libeigen3-dev
 
 RUN git clone --depth 1 https://github.com/rdkit/rdkit.git $SRC/rdkit
 WORKDIR $SRC/rdkit
diff --git a/projects/simdjson/Dockerfile b/projects/simdjson/Dockerfile
index 9000a9b6..a0e62af5 100644
--- a/projects/simdjson/Dockerfile
+++ b/projects/simdjson/Dockerfile
@@ -19,12 +19,6 @@ MAINTAINER pauldreikossfuzz@gmail.com
 
 RUN apt-get update && apt-get install -y ninja-build wget
 
-# We need a modern cmake
-ENV CMAKEVER 3.15.4
-RUN wget --quiet https://github.com/Kitware/CMake/releases/download/v${CMAKEVER}/cmake-${CMAKEVER}-Linux-x86_64.sh ;\
-    chmod +x cmake-${CMAKEVER}-Linux-x86_64.sh ; \
-    ./cmake-${CMAKEVER}-Linux-x86_64.sh --skip-license --prefix="/usr/local"
-
 RUN git clone --depth 1 https://github.com/simdjson/simdjson.git simdjson
 WORKDIR simdjson
 COPY build.sh $SRC/