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

Update test Docker container versions #2239

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −5
Open

Update test Docker container versions #2239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update test Docker container versions 
Previously these test Docker containers used
https://github.com/kolide/docker-osquery, which no longer seems to be
maintained and has very old osquery versions (2.7.0). Migrate to using
containers from the new https://github.com/dactivllc/docker-osquery
project. This brings Fleet to testing with current (4.3.0) osquery on an
expanded set of operating systems.
  • Loading branch information
@zwass
zwass committed May 25, 2020

Verified

This commit was signed with the committer’s verified signature.
jpelgrom Joris Pelgröm
GPG key ID: 91E703F887B3D33C
Verified
Learn about vigilant mode
commit aeb0f4101e25f967860ecc105a69068852b0fa3d
49 changes: 44 additions & 5 deletions tools/osquery/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ version: '2'

services:
ubuntu14-osquery:
image: "kolide/osquery:${KOLIDE_OSQUERY_VERSION}"
image: "dactiv/osquery:4.3.0-ubuntu14.04"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that this is in the kolide org, it may make more sense to fix kolide/osquery? Thoughts

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you would like to maintain kolide/osquery, that's fine with me. The important bit IMO is that we are developing with new versions of osquery.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@directionless do you think Kolide can take on maintaining kolide/osquery?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe. Want to help? I can give you permission on both the git side, and the docker side...

volumes:
- ./kolide.crt:/etc/osquery/kolide.crt
- ./example_osquery.flags:/etc/osquery/osquery.flags
@@ -16,7 +16,7 @@ services:
soft: 1000000000

ubuntu16-osquery:
image: "kolide/ubuntu16-osquery:${KOLIDE_OSQUERY_VERSION}"
image: "dactiv/osquery:4.3.0-ubuntu16.04"
volumes:
- ./kolide.crt:/etc/osquery/kolide.crt
- ./example_osquery.flags:/etc/osquery/osquery.flags
@@ -28,8 +28,21 @@ services:
hard: 1000000000
soft: 1000000000

centos7-osquery:
image: "kolide/centos7-osquery:${KOLIDE_OSQUERY_VERSION}"
ubuntu18-osquery:
image: "dactiv/osquery:4.3.0-ubuntu18.04"
volumes:
- ./kolide.crt:/etc/osquery/kolide.crt
- ./example_osquery.flags:/etc/osquery/osquery.flags
environment:
ENROLL_SECRET: "${ENROLL_SECRET}"
command: osqueryd --flagfile=/etc/osquery/osquery.flags
ulimits:
core:
hard: 1000000000
soft: 1000000000

ubuntu20-osquery:
image: "dactiv/osquery:4.3.0-ubuntu20.04"
volumes:
- ./kolide.crt:/etc/osquery/kolide.crt
- ./example_osquery.flags:/etc/osquery/osquery.flags
@@ -42,7 +55,33 @@ services:
soft: 1000000000

centos6-osquery:
image: "kolide/centos6-osquery:${KOLIDE_OSQUERY_VERSION}"
image: "dactiv/osquery:4.3.0-centos6"
volumes:
- ./kolide.crt:/etc/osquery/kolide.crt
- ./example_osquery.flags:/etc/osquery/osquery.flags
environment:
ENROLL_SECRET: "${ENROLL_SECRET}"
command: osqueryd --flagfile=/etc/osquery/osquery.flags
ulimits:
core:
hard: 1000000000
soft: 1000000000

centos7-osquery:
image: "dactiv/osquery:4.3.0-centos7"
volumes:
- ./kolide.crt:/etc/osquery/kolide.crt
- ./example_osquery.flags:/etc/osquery/osquery.flags
environment:
ENROLL_SECRET: "${ENROLL_SECRET}"
command: osqueryd --flagfile=/etc/osquery/osquery.flags
ulimits:
core:
hard: 1000000000
soft: 1000000000

centos8-osquery:
image: "dactiv/osquery:4.3.0-centos8"
volumes:
- ./kolide.crt:/etc/osquery/kolide.crt
- ./example_osquery.flags:/etc/osquery/osquery.flags