Skip to content
This repository has been archived by the owner on Dec 15, 2020. It is now read-only.

Commit

Permalink
Support adding host.docker.internal dns on Linux
Browse files Browse the repository at this point in the history
* Fixes #2319 by allowing Linux users to add `extra_hosts` settings,
which create an `/etc/hosts` entry for `host.docker.internal`.
  • Loading branch information
nyanshak committed Oct 7, 2020
1 parent 9e9898b commit 254b09b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
10 changes: 9 additions & 1 deletion tools/osquery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,20 @@ besides `host.docker.internal:8080`.

The osqueryd instances are configured to use the TLS plugins at `host.docker.internal:8080`. Using the `example_osquery.flags` in this directory should configure Fleet with the appropriate settings for these `osqueryd` containers to connect.

To start one instance each of Centos and Ubuntu `osqueryd`, use:
To start one instance each of Centos 6, Centos 7, Ubuntu 14, and Ubuntu 16
`osqueryd`, use:

```
docker-compose up
```

Linux users should use the overrides (which add DNS entries for
`host.docker.internal` based on the `DOCKER_HOST` env var):

```
docker-compose -f docker-compose.yml -f docker-compose.linux-overrides.yml up
```

The logs will be displayed on the host shell. Note that `docker-compose up` will reuse containers (so the state of `osqueryd` will be maintained across calls). To remove the containers and start from a fresh state on the next call to `up`, use:

```
Expand Down
21 changes: 21 additions & 0 deletions tools/osquery/docker-compose.linux-overrides.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
version: '2'

x-default-settings:
extra_hosts: &linux-extra-hosts
# Add host.docker.internal record to /etc/hosts of the containers. This is
# added on Docker for Mac by default, but needs to be added by Linux users.
- "host.docker.internal:${DOCKER_HOST:-172.17.0.1}"

services:
ubuntu14-osquery:
extra_hosts: *linux-extra-hosts

ubuntu16-osquery:
extra_hosts: *linux-extra-hosts

centos7-osquery:
extra_hosts: *linux-extra-hosts

centos6-osquery:
extra_hosts: *linux-extra-hosts

0 comments on commit 254b09b

Please sign in to comment.