From a0d787d7ad83dd905c63f011c975c9de78781c82 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Wed, 24 Jul 2019 18:07:44 -0700 Subject: [PATCH] update osquery Signed-off-by: Jess Frazelle --- osquery/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/osquery/Dockerfile b/osquery/Dockerfile index 4a04aa1..057482e 100644 --- a/osquery/Dockerfile +++ b/osquery/Dockerfile @@ -3,6 +3,7 @@ LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ ca-certificates \ + libc++1-7 \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* @@ -23,21 +24,23 @@ RUN buildDeps=' \ && set -x \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /usr/src/osquery/build \ + && mkdir -p /usr/src/osquery/build /usr/share/osquery \ && git clone --branch "${OSQUERY_VERSION}" --depth 1 https://github.com/osquery/osquery.git /usr/src/osquery/src \ && cd /usr/src/osquery \ && ls -la src/ \ && cd build \ && cmake ../src -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \ - && cmake --build . -j # // where # is the number of parallel build jobs \ - && ls -la \ + && cmake --build . -j \ + && mv osquery/osqueryd /usr/bin \ + && mv package/linux/osqueryctl /usr/bin \ && apt-get purge -y --auto-remove $buildDeps \ - && chmod a+x /usr/bin/osquery* + && chmod a+x /usr/bin/osquery* \ + && cp -r /usr/src/osquery/src/packs /usr/share/osquery/ COPY osquery.example.conf /etc/osquery/osquery.conf ENV HOME /home/user -RUN mkdir -p /var/osquery /usr/share/osquery /var/log/osquery \ +RUN mkdir -p /var/osquery /var/log/osquery \ && useradd --create-home --home-dir $HOME user \ && chown -R user:user $HOME /etc/osquery /var/osquery /usr/share/osquery /var/log/osquery