From 1efd279cc11dfa19062f0583e763c66ece6502e8 Mon Sep 17 00:00:00 2001 From: Yandry Perez Clemente <99700024+ypc-faros@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:37:10 -0400 Subject: [PATCH] Allows to override metabase db cfg values --- .env | 3 +++ docker-compose.yaml | 2 ++ init/scripts/metabase-init.sh | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.env b/.env index ff4b56f2..bce91606 100644 --- a/.env +++ b/.env @@ -132,6 +132,9 @@ METABASE_PORT=3000 METABASE_USER=admin@admin.com METABASE_PASSWORD=admin METABASE_URL=http://metabase:3000 +METABASE_USE_SSL=false +# The db_host used in Metabase to connect to the Faros database. +METABASE_FAROS_DB_HOST=faros-db ############################## n8n ############################################ N8N_DB_NAME=n8n diff --git a/docker-compose.yaml b/docker-compose.yaml index 865c25d8..77471bb1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -57,9 +57,11 @@ services: FAROS_EMAIL: ${FAROS_EMAIL} HASURA_URL: ${HASURA_URL?} LOG_LEVEL: ${FAROS_INIT_LOG_LEVEL:-info} + METABASE_FAROS_DB_HOST: ${METABASE_FAROS_DB_HOST?} METABASE_PASSWORD: ${METABASE_PASSWORD?} METABASE_URL: ${METABASE_URL?} METABASE_USER: ${METABASE_USER?} + METABASE_USE_SSL: ${METABASE_USE_SSL?} FAROS_DB_NAME: ${FAROS_DB_NAME?} FAROS_DB_HOST: ${FAROS_DB_HOST?} FAROS_DB_PORT: ${FAROS_DB_PORT?} diff --git a/init/scripts/metabase-init.sh b/init/scripts/metabase-init.sh index d0d49926..cc361122 100755 --- a/init/scripts/metabase-init.sh +++ b/init/scripts/metabase-init.sh @@ -4,11 +4,12 @@ [[ -z "$METABASE_USER" ]] && echo "METABASE_USER not set" && exit 1 [[ -z "$METABASE_PASSWORD" ]] && echo "METABASE_PASSWORD not set" && exit 1 -db_host=$FAROS_DB_HOST +db_host=$METABASE_FAROS_DB_HOST db_port=$FAROS_DB_PORT db_name=$FAROS_DB_NAME db_user=$FAROS_DB_USER db_password=$FAROS_DB_PASSWORD +use_ssl=$METABASE_USE_SSL mb_url=$METABASE_URL mb_user=$METABASE_USER @@ -20,6 +21,7 @@ mb_db_payload=$(jq -n \ --arg db_name "$db_name" \ --arg db_user "$db_user" \ --arg db_password "$db_password" \ +--argjson use_ssl "$use_ssl" \ '{ "engine": "postgres", "name": "Faros Data", @@ -29,7 +31,7 @@ mb_db_payload=$(jq -n \ "dbname": $db_name, "user": $db_user, "password": $db_password, - "ssl": false, + "ssl": $use_ssl, "additional-options": null, "tunnel-enabled": false, "let-user-control-scheduling": false