diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile index f580288afa4..36053bdd4c0 100644 --- a/docker/builder/Dockerfile +++ b/docker/builder/Dockerfile @@ -10,6 +10,7 @@ ARG BUILD_BPF=OFF ARG BUILD_WARNINGS_AS_ERRORS=ON ARG MAKE_JOBS=4 ARG FALCO_VERSION +ARG CMAKE_VERSION=3.22.5 ENV BUILD_TYPE=${BUILD_TYPE} ENV BUILD_DRIVER=${BUILD_DRIVER} @@ -17,22 +18,22 @@ ENV BUILD_BPF=${BUILD_BPF} ENV BUILD_WARNINGS_AS_ERRORS=${BUILD_WARNINGS_AS_ERRORS} ENV MAKE_JOBS=${MAKE_JOBS} ENV FALCO_VERSION=${FALCO_VERSION} +ENV CMAKE_VERSION=${CMAKE_VERSION} # build toolchain RUN yum -y install centos-release-scl && \ - INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel llvm-toolset-7 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel rpm-build libyaml-devel" && \ + INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel llvm-toolset-7.0 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel rpm-build libyaml-devel" && \ yum -y install --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS -ARG CMAKE_VERSION=3.6.3 -RUN source scl_source enable devtoolset-7 llvm-toolset-7 && \ - cd /tmp && \ - curl -L https://github.com/kitware/cmake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz | tar xz; \ - cd cmake-${CMAKE_VERSION} && \ - ./bootstrap --system-curl && \ - make -j${MAKE_JOBS} && \ - make install && \ - rm -rf /tmp/cmake-${CMAKE_VERSION} + +RUN source scl_source enable devtoolset-7 llvm-toolset-7.0 + +RUN curl -L -o /tmp/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar.gz https://github.com/kitware/cmake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar.gz && \ + gzip -d /tmp/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar.gz && \ + tar -xpf /tmp/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar --directory=/tmp && \ + cp -R /tmp/cmake-${CMAKE_VERSION}-linux-$(uname -m)/* /usr && \ + rm -rf /tmp/cmake-${CMAKE_VERSION}-linux-$(uname -m) COPY ./root / diff --git a/docker/builder/root/usr/bin/scl_enable b/docker/builder/root/usr/bin/scl_enable index 34b7b7c1c0c..e7efbd93e8a 100644 --- a/docker/builder/root/usr/bin/scl_enable +++ b/docker/builder/root/usr/bin/scl_enable @@ -3,4 +3,4 @@ # # This will make scl collection binaries work out of box. unset BASH_ENV PROMPT_COMMAND ENV -source scl_source enable devtoolset-7 llvm-toolset-7 +source scl_source enable devtoolset-7 llvm-toolset-7.0