cleaner overridable haprouter config

ORCID · Dec 9, 2024 · 8ae0c47 · 8ae0c47
1 parent 34085f5
commit 8ae0c47
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -46,19 +46,9 @@ services:
     build:
       context: .
       dockerfile: orcid-haprouter/Dockerfile
-    environment:
-      POSTGRES_READ_FQDN_A: postgres
-      POSTGRES_READ_FQDN_B: localhost
-      POSTGRES_READ_FQDN_C: localhost
-      POSTGRES_WRITE_FQDN_A: postgres
-      POSTGRES_WRITE_FQDN_B: localhost
-      POSTGRES_WRITE_FQDN_C: localhost
-      SOLR_READ_FQDN_A: solr
-      SOLR_READ_FQDN_B: localhost
-      SOLR_READ_FQDN_C: localhost
-      SOLR_WRITE_FQDN_A: solr
-      SOLR_WRITE_FQDN_B: localhost
-      SOLR_WRITE_FQDN_C: localhost
+    env_file:
+      - orcid-haprouter/dev.env
+      - orcid-haprouter/deployment.env
     ports:
       - 0.0.0.0:8888:1936 # stats
       - 0.0.0.0:7983:7983 # solr read

diff --git a/orcid-haprouter/deployment.env b/orcid-haprouter/deployment.env
@@ -0,0 +1 @@
+# empty file that is written out by deployment systems
diff --git a/orcid-haprouter/dev.env b/orcid-haprouter/dev.env
@@ -0,0 +1,12 @@
+POSTGRES_READ_FQDN_A=postgres
+POSTGRES_READ_FQDN_B=localhost
+POSTGRES_READ_FQDN_C=localhost
+POSTGRES_WRITE_FQDN_A=postgres
+POSTGRES_WRITE_FQDN_B=localhost
+POSTGRES_WRITE_FQDN_C=localhost
+SOLR_READ_FQDN_A=solr
+SOLR_READ_FQDN_B=localhost
+SOLR_READ_FQDN_C=localhost
+SOLR_WRITE_FQDN_A=solr
+SOLR_WRITE_FQDN_B=localhost
+SOLR_WRITE_FQDN_C=localhost
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# empty file that is written out by deployment systems