diff --git a/.travis.yml b/.travis.yml index 5eff4589d20..83dfa15ee7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - sudo apt-get update install: - sudo apt-get --force-yes install g++-4.8 - - sudo apt-get install rpm linux-headers-$(uname -r) + - sudo apt-get install rpm linux-headers-$(uname -r) libelf-dev - git clone https://github.com/draios/sysdig.git ../sysdig - sudo apt-get install -y python-pip libvirt-dev jq dkms - cd .. diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 22c5c02735b..39247abe36f 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -17,6 +17,8 @@ ADD http://download.draios.com/apt-draios-priority /etc/apt/preferences.d/ RUN apt-get update \ && apt-get install -y --no-install-recommends \ bash-completion \ + bc \ + clang-7 \ ca-certificates \ curl \ gnupg2 \ @@ -26,12 +28,18 @@ RUN apt-get update \ jq \ libc6-dev \ libelf-dev \ + llvm-7 \ && rm -rf /var/lib/apt/lists/* # Since our base Debian image ships with GCC 7 which breaks older kernels, revert the # default to gcc-5. RUN rm -rf /usr/bin/gcc && ln -s /usr/bin/gcc-5 /usr/bin/gcc +RUN rm -rf /usr/bin/clang \ + && rm -rf /usr/bin/llc \ + && ln -s /usr/bin/clang-7 /usr/bin/clang \ + && ln -s /usr/bin/llc-7 /usr/bin/llc + RUN curl -s https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public | apt-key add - \ && curl -s -o /etc/apt/sources.list.d/draios.list http://download.draios.com/$FALCO_REPOSITORY/deb/draios.list \ && apt-get update \ diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 7e75db18941..4d99b3e1120 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -17,6 +17,8 @@ ADD http://download.draios.com/apt-draios-priority /etc/apt/preferences.d/ RUN apt-get update \ && apt-get install -y --no-install-recommends \ bash-completion \ + bc \ + clang-7 \ ca-certificates \ curl \ dkms \ @@ -26,12 +28,18 @@ RUN apt-get update \ jq \ libc6-dev \ libelf-dev \ + llvm-7 \ && rm -rf /var/lib/apt/lists/* # Since our base Debian image ships with GCC 7 which breaks older kernels, revert the # default to gcc-5. RUN rm -rf /usr/bin/gcc && ln -s /usr/bin/gcc-5 /usr/bin/gcc +RUN rm -rf /usr/bin/clang \ + && rm -rf /usr/bin/llc \ + && ln -s /usr/bin/clang-7 /usr/bin/clang \ + && ln -s /usr/bin/llc-7 /usr/bin/llc + RUN ln -s $SYSDIG_HOST_ROOT/lib/modules /lib/modules ADD falco-${FALCO_VERSION}-x86_64.deb / diff --git a/docker/stable/Dockerfile b/docker/stable/Dockerfile index bfbad4408a7..ca4fde81703 100644 --- a/docker/stable/Dockerfile +++ b/docker/stable/Dockerfile @@ -17,6 +17,8 @@ ADD http://download.draios.com/apt-draios-priority /etc/apt/preferences.d/ RUN apt-get update \ && apt-get install -y --no-install-recommends \ bash-completion \ + bc \ + clang-7 \ ca-certificates \ curl \ gnupg2 \ @@ -25,12 +27,18 @@ RUN apt-get update \ jq \ libc6-dev \ libelf-dev \ + llvm-7 \ && rm -rf /var/lib/apt/lists/* # Since our base Debian image ships with GCC 7 which breaks older kernels, revert the # default to gcc-5. RUN rm -rf /usr/bin/gcc && ln -s /usr/bin/gcc-5 /usr/bin/gcc +RUN rm -rf /usr/bin/clang \ + && rm -rf /usr/bin/llc \ + && ln -s /usr/bin/clang-7 /usr/bin/clang \ + && ln -s /usr/bin/llc-7 /usr/bin/llc + RUN curl -s https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public | apt-key add - \ && curl -s -o /etc/apt/sources.list.d/draios.list http://download.draios.com/$FALCO_REPOSITORY/deb/draios.list \ && apt-get update \