From 73e1ae616a3835b1df3721bc1264e4913be1c831 Mon Sep 17 00:00:00 2001 From: David Archer Date: Mon, 30 Apr 2018 17:30:39 -0400 Subject: [PATCH] Don't make driver compilation fail when kernel is compiled with CONFIG_ORC_UNWINDER or CONFIG_STACK_VALIDATION. (#362) sysdig-CLA-1.0-signed-off-by: David Archer --- docker/dev/Dockerfile | 11 +++++++---- docker/local/Dockerfile | 11 +++++++---- docker/stable/Dockerfile | 9 ++++++--- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 605fbd5d..22c5c027 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -17,13 +17,16 @@ 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 \ - curl \ - jq \ - gnupg2 \ ca-certificates \ + curl \ + gnupg2 \ gcc \ gcc-5 \ - gdb && rm -rf /var/lib/apt/lists/* + gdb \ + jq \ + libc6-dev \ + libelf-dev \ + && 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. diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 3bb85a22..7e75db18 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -17,13 +17,16 @@ 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 \ - curl \ - jq \ - gnupg2 \ ca-certificates \ + curl \ + dkms \ + gnupg2 \ gcc \ gcc-5 \ - dkms && rm -rf /var/lib/apt/lists/* + jq \ + libc6-dev \ + libelf-dev \ + && 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. diff --git a/docker/stable/Dockerfile b/docker/stable/Dockerfile index 7887bb7b..bfbad440 100644 --- a/docker/stable/Dockerfile +++ b/docker/stable/Dockerfile @@ -17,12 +17,15 @@ 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 \ - curl \ - jq \ ca-certificates \ + curl \ gnupg2 \ gcc \ - gcc-5 && rm -rf /var/lib/apt/lists/* + gcc-5 \ + jq \ + libc6-dev \ + libelf-dev \ + && 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.