github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-09-03 23:55:06 +00:00
Code Issues Projects Releases Wiki Activity

fix(docker/builder): add llvm toolset back to falco-builder

Browse Source 
Co-authored-by: Lorenzo Fontana <lo@linux.com>
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
This commit is contained in:
Leonardo Di Donato
2020-01-21 11:27:33 +00:00
committed by poiana
parent 29847df168
commit 12a86d33ef
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/builder/Dockerfile
View File

@@ -20,12 +20,12 @@ ENV FALCO_VERSION=${FALCO_VERSION}
# build toolchain # build toolchain
RUN yum -y install centos-release-scl && \ 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 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel ncurses-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 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel ncurses-devel rpm-build libyaml-devel" && \
yum -y install --setopt=tsflags=nodocs $INSTALL_PKGS && \ yum -y install --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS rpm -V $INSTALL_PKGS
ARG CMAKE_VERSION=3.5.1 ARG CMAKE_VERSION=3.5.1
RUN source scl_source enable devtoolset-7 && \ RUN source scl_source enable devtoolset-7 llvm-toolset-7 && \
cd /tmp && \ cd /tmp && \
curl -L https://github.com/kitware/cmake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz | tar xz; \ curl -L https://github.com/kitware/cmake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz | tar xz; \
cd cmake-${CMAKE_VERSION} && \ cd cmake-${CMAKE_VERSION} && \

2
docker/builder/root/usr/bin/scl_enable
View File

@@ -3,4 +3,4 @@
# #
# This will make scl collection binaries work out of box. # This will make scl collection binaries work out of box.
unset BASH_ENV PROMPT_COMMAND ENV unset BASH_ENV PROMPT_COMMAND ENV
source scl_source enable devtoolset-7 source scl_source enable devtoolset-7 llvm-toolset-7