From c69b6b7c01a33f033e86fa282383d8c96af5370a Mon Sep 17 00:00:00 2001 From: Sang Oh <28380215+sko9370@users.noreply.github.com> Date: Thu, 21 Mar 2024 15:39:30 -0400 Subject: [PATCH 1/3] Update Docker Usage.md Put link to rita_docker.yaml so that people don't accidentally use rita.yaml, which will not work for docker compose setup. --- docs/Docker Usage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Docker Usage.md b/docs/Docker Usage.md index 5bbe36ac..eb41c93e 100644 --- a/docs/Docker Usage.md +++ b/docs/Docker Usage.md @@ -21,7 +21,7 @@ sudo docker build -t quay.io/activecm/rita . ## Running RITA with Docker Compose -You will need a config file where you have [put in your `InternalSubnets`](../Readme.md#configuration-file). +You will need a [config file](rita/etc/rita_docker.yaml) (make sure to use rita_docker.yaml instead of rita.yaml) where you have [put in your `InternalSubnets`](../Readme.md#configuration-file). You will also need the path to your Zeek log files. ``` From 50d66bd8eaf17078899fe0125c8088ebce966ee1 Mon Sep 17 00:00:00 2001 From: Sang Oh <28380215+sko9370@users.noreply.github.com> Date: Thu, 21 Mar 2024 15:40:32 -0400 Subject: [PATCH 2/3] Update rita_docker.yaml Change container name db to mongo-db for clarity and avoid overlap with docker volume of the same name. --- etc/rita_docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/rita_docker.yaml b/etc/rita_docker.yaml index 11d397c6..e754a44d 100644 --- a/etc/rita_docker.yaml +++ b/etc/rita_docker.yaml @@ -1,7 +1,7 @@ # This section configures the connection to the MongoDB server and the database name to use MongoDB: # See https://docs.mongodb.com/manual/reference/connection-string/ - ConnectionString: mongodb://db:27017 + ConnectionString: mongodb://mongo-db:27017 # Example with authentication. Be sure to change the AuthenticationMechanism as well. # ConnectionString: mongodb://username:password@localhost:27017 From 07f259b9fd1302db4b9bf25971f1e982a62066e6 Mon Sep 17 00:00:00 2001 From: Sang Oh <28380215+sko9370@users.noreply.github.com> Date: Thu, 21 Mar 2024 15:41:45 -0400 Subject: [PATCH 3/3] Update docker-compose.yml Change container name "db" to "mongo-db" to avoid confusion and overlap with volume "db". Change is also reflected in updated rita_docker.yaml --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 19a796d1..eab4ea9b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: - db: + mongo-db: image: mongo:4.2 volumes: - db:/data/db/ @@ -10,7 +10,7 @@ services: image: quay.io/activecm/rita:${VERSION:-latest} build: . depends_on: - - db + - mongo-db volumes: - ${CONFIG:?You must provide a path to your CONFIG}:/etc/rita/config.yaml:ro - ${LOGS:?You must provide a path to your LOGS}:/logs:ro