From 10bbce5306a95e56ca41cbdcfb2a5bbca195fc8c Mon Sep 17 00:00:00 2001 From: cjenkscybercom Date: Tue, 26 Mar 2024 09:15:16 +0100 Subject: [PATCH 1/2] fix: set host vars in docker compose --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index c9156da..beed63f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,10 @@ services: depends_on: - mongo - elastic + environment: + cors.allowed.origins: http://localhost:3000 + mongo.host: mongo + elasticsearch.network.host: elastic # Ensure that the elastic server is up before starting olog. command: > /bin/bash -c " From 099e3df14083442c6d775a8c62ea7f1cef8fa617 Mon Sep 17 00:00:00 2001 From: cjenkscybercom Date: Tue, 26 Mar 2024 16:05:17 +0100 Subject: [PATCH 2/2] remove duplicate cors arg, add args to int test --- docker-compose-integrationtest.yml | 2 ++ docker-compose.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose-integrationtest.yml b/docker-compose-integrationtest.yml index 799f4e8..50c71b6 100644 --- a/docker-compose-integrationtest.yml +++ b/docker-compose-integrationtest.yml @@ -17,6 +17,8 @@ services: embedded_ldap.enabled: "false" demo_auth.enabled: "true" skipITCoverage: "true" + mongo.host: mongo + elasticsearch.network.host: elastic command: > /bin/bash -c " while ! curl -s -f elastic:9200/_cluster/health?wait_for_status=yellow; diff --git a/docker-compose.yml b/docker-compose.yml index beed63f..ea7ec85 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,6 @@ services: - mongo - elastic environment: - cors.allowed.origins: http://localhost:3000 mongo.host: mongo elasticsearch.network.host: elastic # Ensure that the elastic server is up before starting olog.