From df2653e46ae8bcf0912412c671aed433fe7f357a Mon Sep 17 00:00:00 2001 From: John Murphy Date: Thu, 24 Nov 2016 01:59:23 +0800 Subject: [PATCH] Updated so you can choose to run 1.8.2 or 2.1.2 osquery (#527) --- tools/osquery/README.md | 4 +++- tools/osquery/docker-compose.yml | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/osquery/README.md b/tools/osquery/README.md index 132833c80d..729a601d51 100644 --- a/tools/osquery/README.md +++ b/tools/osquery/README.md @@ -21,7 +21,9 @@ Using Docker enables us to rapidly spin up and down pre-configured `osqueryd` in Docker and docker-compose are the only dependencies. The necessary container images will be pulled from Docker Cloud on first run. -Before using the following commands, set the environment variable `LOCALHOST` to the public IP (127.0.0.1 will not work) of the docker host machine. This will allow the containers to connect to the local Kolide server. +Before using the following commands, set the environment variable `LOCALHOST` to the public IP (127.0.0.1 will not work) of the docker host machine. This will allow the containers to connect to the local Kolide server. You will also need to +set `KOLIDE_OSQUERY_VERSION` to either `1.8.2` or `latest` (currently 2.1.2) to indicate which version of osquery that you want to run on your +containers. ### Running osqueryd diff --git a/tools/osquery/docker-compose.yml b/tools/osquery/docker-compose.yml index a2d386b147..3e5ec5efba 100644 --- a/tools/osquery/docker-compose.yml +++ b/tools/osquery/docker-compose.yml @@ -1,8 +1,9 @@ + version: '2' services: ubuntu14-osquery: - image: kolide/osquery + image: "kolide/osquery:${KOLIDE_OSQUERY_VERSION}" volumes: - ./kolide.crt:/etc/osquery/kolide.crt - ./example_osquery.flags:/etc/osquery/osquery.flags @@ -14,7 +15,7 @@ services: command: osqueryd --flagfile=/etc/osquery/osquery.flags centos7-osquery: - image: kolide/centos7-osquery + image: "kolide/centos7-osquery:${KOLIDE_OSQUERY_VERSION}" volumes: - ./kolide.crt:/etc/osquery/kolide.crt - ./example_osquery.flags:/etc/osquery/osquery.flags