From 1b7f68274a83c2fbfeca9a8136f75b9da7e87927 Mon Sep 17 00:00:00 2001 From: kevkevin Date: Mon, 26 Feb 2024 16:53:48 -0600 Subject: [PATCH 1/3] added env vars to use instead of the local neo4j --- src/images/jarvis.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/images/jarvis.rs b/src/images/jarvis.rs index 87d415c3a..95a3f680c 100644 --- a/src/images/jarvis.rs +++ b/src/images/jarvis.rs @@ -63,7 +63,15 @@ fn jarvis( let img = format!("{}/{}", repo.org, repo.repo); let root_vol = "/data/jarvis"; let ports = vec![node.port.clone()]; + let neo4jName = &neo4j.name + let neo4jBoltPort = &neo4j.bolt_port + if let Ok(neo4jNameVal) = getenv("JARVIS_NEO4J_NAME") { + neo4jName = neo4jNameVal + } + if let Ok(neo4jBoltPortVal) = getenv("JARVIS_BOLT_PORT") { + neo4jBoltPort = neo4jBoltPortVal + } let mut env = vec![ format!( "NEO4J_URI=neo4j://{}:{}", From 4660f79e6d59e01e0f257ac66ff5c8b32542c219 Mon Sep 17 00:00:00 2001 From: kevkevin Date: Mon, 26 Feb 2024 16:57:01 -0600 Subject: [PATCH 2/3] added user and pass for neo4j --- src/images/jarvis.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/images/jarvis.rs b/src/images/jarvis.rs index 95a3f680c..ee77a6210 100644 --- a/src/images/jarvis.rs +++ b/src/images/jarvis.rs @@ -109,6 +109,12 @@ fn jarvis( h )); } + if let Ok(jarvis_neo4j_user) = getenv("JARVIS_NEO4J_USER") { + env.push(format!("JARVIS_NEO4J_USER={}", jarvis_neo4j_user)); + } + if let Ok(jarvis_neo4j_pass) = getenv("JARVIS_NEO4J_PASS") { + env.push(format!("JARVIS_NEO4J_PASS={}", jarvis_neo4j_pass)); + } // from the stack-prod.yml if let Ok(stakwork_key) = getenv("STAKWORK_ADD_NODE_TOKEN") { env.push(format!("STAKWORK_ADD_NODE_TOKEN={}", stakwork_key)); From 89d82359abd5f75cc0488562b68d3a6541607300 Mon Sep 17 00:00:00 2001 From: kevkevin Date: Mon, 26 Feb 2024 17:04:29 -0600 Subject: [PATCH 3/3] adding env vars --- docker-compose.yml | 4 ++++ second-brain.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ef94caa54..c31679c2a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,6 +81,10 @@ services: - NO_SECOND_BRAIN=$NO_SECOND_BRAIN - SPHINXV1=$SPHINXV1 - ANNOUNCE_ADDRESS=$ANNOUNCE_ADDRESS + - JARVIS_NEO4J_NAME=$JARVIS_NEO4J_NAME + - JARVIS_BOLT_PORT=$JARVIS_BOLT_PORT + - JARVIS_NEO4J_USER=$JARVIS_NEO4J_USER + - JARVIS_NEO4J_PASS=$JARVIS_NEO4J_PASS networks: sphinx-swarm: diff --git a/second-brain.yml b/second-brain.yml index 6cf9a553e..13c30da9d 100644 --- a/second-brain.yml +++ b/second-brain.yml @@ -88,6 +88,10 @@ services: - RADAR_TWITTER_SCHEDULER_TIME_IN_SEC=$RADAR_TWITTER_SCHEDULER_TIME_IN_SEC - NAV_BOLTWALL_SHARED_HOST=$NAV_BOLTWALL_SHARED_HOST - SWARM_UPDATER_PASSWORD=$SWARM_UPDATER_PASSWORD + - JARVIS_NEO4J_NAME=$JARVIS_NEO4J_NAME + - JARVIS_BOLT_PORT=$JARVIS_BOLT_PORT + - JARVIS_NEO4J_USER=$JARVIS_NEO4J_USER + - JARVIS_NEO4J_PASS=$JARVIS_NEO4J_PASS networks: sphinx-swarm: