From 80eeff9c2dfe134fb378568a8e7857ab83947025 Mon Sep 17 00:00:00 2001
From: Nicolas Ochem <nicolas.ochem@gmail.com>
Date: Sat, 20 Mar 2021 02:33:41 -0700
Subject: [PATCH] allow custom hostnames setting for db, elastic, rabbit with
 envvar (#554)

* allow custom hostnames setting for db, elastic, rabbit with envvar

You can not always assume the hostname of the remote services.

For example, in tezos-k8s, I am running everything in a pod, so
I need to set everything to `localhost`.

In order to not disrupt any existing workflow, we set these env
vars to standard values in the Dockerfile; they can be overridden
at runtime. See: https://stackoverflow.com/a/40334819/207209

* use default env in docker-compose instead of Dockerfile

* postgres => db
---
 configs/production.yml | 8 ++++----
 configs/sandbox.yml    | 6 +++---
 configs/you.yml        | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configs/production.yml b/configs/production.yml
index d593a33ce..7d788c0e4 100644
--- a/configs/production.yml
+++ b/configs/production.yml
@@ -23,16 +23,16 @@ tzkt:
 
 storage:
   uri:
-    - http://elastic:9200
-    - http://elastic:9200
+    - http://${ELASTIC_HOSTNAME:-elastic}:9200
+    - http://${ELASTIC_HOSTNAME:-elastic}:9200
   timeout: 10
 
 rabbitmq:
-  uri: "amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@mq:5672/"
+  uri: "amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOSTNAME:-mq}:5672/"
   timeout: 10
 
 db:
-  conn_string: "host=db port=5432 user=${POSTGRES_USER} dbname=${POSTGRES_DB} password=${POSTGRES_PASSWORD} sslmode=disable"
+  conn_string: "host=${DB_HOSTNAME:-db} port=5432 user=${POSTGRES_USER} dbname=${POSTGRES_DB} password=${POSTGRES_PASSWORD} sslmode=disable"
   timeout: 10
 
 oauth:
diff --git a/configs/sandbox.yml b/configs/sandbox.yml
index 9c1b174eb..ba810886b 100644
--- a/configs/sandbox.yml
+++ b/configs/sandbox.yml
@@ -5,15 +5,15 @@ rpc:
 
 storage:
   uri:
-    - http://elastic:9200
+    - http://${ELASTIC_HOSTNAME:-elastic}:9200
   timeout: 10
 
 rabbitmq:
-  uri: "amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@mq:5672/"
+  uri: "amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOSTNAME:-mq}:5672/"
   timeout: 10
 
 db:
-  conn_string: "host=db port=5432 user=${POSTGRES_USER} dbname=${POSTGRES_DB} password=${POSTGRES_PASSWORD} sslmode=disable"
+  conn_string: "host=${DB_HOSTNAME:-db} port=5432 user=${POSTGRES_USER} dbname=${POSTGRES_DB} password=${POSTGRES_PASSWORD} sslmode=disable"
   timeout: 10
 
 share_path: ${HOME}/.bcd
diff --git a/configs/you.yml b/configs/you.yml
index 7522b3c00..338d2c079 100644
--- a/configs/you.yml
+++ b/configs/you.yml
@@ -23,15 +23,15 @@ tzkt:
 
 storage:
   uri:
-    - http://elastic:9200
+    - http://${ELASTIC_HOSTNAME:-elastic}:9200
   timeout: 10
 
 rabbitmq:
-  uri: "amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@mq:5672/"
+  uri: "amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOSTNAME:-mq}:5672/"
   timeout: 10
 
 db:
-  conn_string: "host=db port=5432 user=${POSTGRES_USER} dbname=${POSTGRES_DB} password=${POSTGRES_PASSWORD} sslmode=disable"
+  conn_string: "host=${DB_HOSTNAME:-db} port=5432 user=${POSTGRES_USER} dbname=${POSTGRES_DB} password=${POSTGRES_PASSWORD} sslmode=disable"
   timeout: 10
 
 oauth: