Skip to content

Commit

Permalink
Merge pull request #429 from jmpsec/osquery-5.11.0
Browse files Browse the repository at this point in the history
Adding support for osquery 5.11.0
  • Loading branch information
javuto authored Apr 6, 2024
2 parents af0a7c1 + d15969d commit d184988
Show file tree
Hide file tree
Showing 11 changed files with 235 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OSCTRL_VERSION=0.3.5
OSQUERY_VERSION=5.10.2
OSQUERY_VERSION=5.11.0
NGINX_VERSION=1.21.6-alpine
POSTGRES_VERSION=13.5-alpine
POSTGRES_DB_NAME=osctrl
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test_main_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
GOLANG_VERSION: 1.21.3
OSQUERY_VERSION: 5.10.2
OSQUERY_VERSION: 5.11.0

jobs:
build_and_test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

env:
GOLANG_VERSION: 1.19.2
OSQUERY_VERSION: 5.10.2
OSQUERY_VERSION: 5.11.0

jobs:
build_and_test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_tagged_releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
GOLANG_VERSION: 1.21.3
OSQUERY_VERSION: 5.10.2
OSQUERY_VERSION: 5.11.0

jobs:
build_and_test:
Expand Down
2 changes: 1 addition & 1 deletion deploy/cicd/deb/generate-deb-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
OSCTRL_USER="${VARIABLE:-osctrl}"
OSCTRL_GROUP="${VARIABLE:-osctrl}"
WORKING_DIR="${VARIABLE:-/etc/osctrl}"
OSQUERY_VESION="${VARIABLE:-5.10.2}"
OSQUERY_VESION="${VARIABLE:-5.11.0}"
OSCTRL_VERSION="${VARIABLE:-0.0.0}"

###################################### Init DEB contents ######################################
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/conf/dev/.env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OSCTRL_VERSION=0.3.5
OSQUERY_VERSION=5.10.2
OSQUERY_VERSION=5.11.0
NGINX_VERSION=1.21.6-alpine
POSTGRES_VERSION=13.5-alpine
POSTGRES_DB_NAME=osctrl
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/dockerfiles/Dockerfile-osquery
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG OSCTRL_VERSION
FROM jmpsec/osctrl-cli:v${OSCTRL_VERSION}

ARG OSQUERY_VERSION=5.10.2
ARG OSQUERY_VERSION=5.11.0

USER root

Expand Down
Loading

0 comments on commit d184988

Please sign in to comment.