Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,15 @@ docker_dev_logs_api:
docker_dev_logs_nginx:
docker logs -f osctrl-nginx-dev

# Display docker logs for osquery client
docker_dev_logs_osquery:
docker logs -f osctrl-osquery-dev
# Display docker logs for osquery clients
docker_dev_logs_osquery-1:
docker logs -f osctrl-osquery-1-dev

docker_dev_logs_osquery-2:
docker logs -f osctrl-osquery-2-dev

docker_dev_logs_osquery-3:
docker logs -f osctrl-osquery-3-dev

# Display docker logs for postgresql server
docker_dev_logs_postgresql:
Expand Down Expand Up @@ -235,9 +241,10 @@ up-backend:
docker_dev_down:
docker-compose -f docker-compose-dev.yml down

# Deletes all osctrl docker images
# Deletes all osctrl docker images and volumes
docker_dev_clean:
docker images | grep osctrl | awk '{print $$3}' | xargs -rI {} docker rmi -f {}
docker volume ls | grep osctrl | awk '{print $$2}' | xargs -rI {} docker volume rm {}

# Rebuild only the TLS server
docker_dev_rebuild_tls:
Expand Down
96 changes: 84 additions & 12 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ services:
ports:
- 127.0.0.1:5432:5432
volumes:
- postgres-dev-db:/var/lib/postgresql/data
- postgres-osctrl-dev-db:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "sh -c 'pg_isready -U ${POSTGRES_DB_USERNAME} -d ${POSTGRES_DB_NAME}'"]
interval: 10s
Expand All @@ -176,7 +176,7 @@ services:
ports:
- 127.0.0.1:6379:6379
volumes:
- redis-dev-data:/data
- redis-osctrl-dev-data:/data
healthcheck:
test: ["CMD", "redis-cli","ping"]
interval: 10s
Expand Down Expand Up @@ -224,10 +224,10 @@ services:
- osctrl-postgres
- osctrl-redis

######################################### osquery #########################################
osquery:
container_name: 'osctrl-osquery-dev'
image: 'osctrl-osquery-dev:${OSCTRL_VERSION}'
######################################### osquery 1 #########################################
osquery-1:
container_name: 'osctrl-osquery-1-dev'
image: 'osctrl-osquery-dev-1:${OSCTRL_VERSION}'
restart: unless-stopped
build:
context: .
Expand All @@ -251,8 +251,76 @@ services:
- type: bind
source: ./deploy/docker/conf/tls/osctrl.crt
target: /opt/osctrl/config/osctrl.crt
- osquery-dev-data:/var/osquery
- osquery-dev-conf:/etc/osquery
- osquery-osctrl-dev-1-data:/var/osquery
- osquery-osctrl-dev-1-conf:/etc/osquery
depends_on:
- osctrl-tls
- osctrl-api
- osctrl-postgres

######################################### osquery 2 #########################################
osquery-2:
container_name: 'osctrl-osquery-2-dev'
image: 'osctrl-osquery-dev-2:${OSCTRL_VERSION}'
restart: unless-stopped
build:
context: .
target: osctrl-ubuntu-osquery
dockerfile: deploy/docker/dockerfiles/Dockerfile-dev-cli
args:
GOLANG_VERSION: ${GOLANG_VERSION}
OSQUERY_VERSION: ${OSQUERY_VERSION}
environment:
#### osquery enroll ####
- ENV_NAME=dev
- HOST=osctrl-nginx
#### Database settings ####
- DB_HOST=osctrl-postgres
- DB_NAME=${POSTGRES_DB_NAME}
- DB_USER=${POSTGRES_DB_USERNAME}
- DB_PASS=${POSTGRES_DB_PASSWORD}
networks:
- osctrl-dev-backend
volumes:
- type: bind
source: ./deploy/docker/conf/tls/osctrl.crt
target: /opt/osctrl/config/osctrl.crt
- osquery-osctrl-dev-2-data:/var/osquery
- osquery-osctrl-dev-2-conf:/etc/osquery
depends_on:
- osctrl-tls
- osctrl-api
- osctrl-postgres

######################################### osquery 3 #########################################
osquery-3:
container_name: 'osctrl-osquery-3-dev'
image: 'osctrl-osquery-dev-3:${OSCTRL_VERSION}'
restart: unless-stopped
build:
context: .
target: osctrl-ubuntu-osquery
dockerfile: deploy/docker/dockerfiles/Dockerfile-dev-cli
args:
GOLANG_VERSION: ${GOLANG_VERSION}
OSQUERY_VERSION: ${OSQUERY_VERSION}
environment:
#### osquery enroll ####
- ENV_NAME=dev
- HOST=osctrl-nginx
#### Database settings ####
- DB_HOST=osctrl-postgres
- DB_NAME=${POSTGRES_DB_NAME}
- DB_USER=${POSTGRES_DB_USERNAME}
- DB_PASS=${POSTGRES_DB_PASSWORD}
networks:
- osctrl-dev-backend
volumes:
- type: bind
source: ./deploy/docker/conf/tls/osctrl.crt
target: /opt/osctrl/config/osctrl.crt
- osquery-osctrl-dev-3-data:/var/osquery
- osquery-osctrl-dev-3-conf:/etc/osquery
depends_on:
- osctrl-tls
- osctrl-api
Expand All @@ -262,7 +330,11 @@ networks:
osctrl-dev-backend:

volumes:
postgres-dev-db:
redis-dev-data:
osquery-dev-data:
osquery-dev-conf:
postgres-osctrl-dev-db:
redis-osctrl-dev-data:
osquery-osctrl-dev-1-data:
osquery-osctrl-dev-1-conf:
osquery-osctrl-dev-2-data:
osquery-osctrl-dev-2-conf:
osquery-osctrl-dev-3-data:
osquery-osctrl-dev-3-conf:
Loading