From 02328b3db38c5da18f3c3d705654c9f7f7e72967 Mon Sep 17 00:00:00 2001 From: Cyril Blaecke <1692273+cbldev@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:56:56 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20database=20URL=20=F0=9F=90=9B=20(#63)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/database.yml | 10 +--------- docker-compose.yml | 8 -------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/config/database.yml b/config/database.yml index f6bfca0..b6f4814 100644 --- a/config/database.yml +++ b/config/database.yml @@ -18,12 +18,6 @@ default: &default # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - <% if ENV["DB_HOST"] %> - host: <%= ENV["DB_HOST"] %> - username: postgres - password: postgres - <% end %> - development: primary: @@ -72,9 +66,7 @@ test: production: primary: &primary_production <<: *default - database: nosia_production - username: nosia - password: <%= ENV["POSTGRES_PASSWORD"] %> + url: <%= ENV["DATABASE_URL"] %> cache: <<: *primary_production database: nosia_production_cache diff --git a/docker-compose.yml b/docker-compose.yml index 44f3bbb..d8e1b4f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,10 +27,6 @@ services: - LLM_MODEL=${LLM_MODEL} - CHECK_MODEL=${CHECK_MODEL} - EMBEDDING_MODEL=${EMBEDDING_MODEL} - - SMTP_ADDRESS=${SMTP_ADDRESS} - - SMTP_PORT=${SMTP_PORT} - - SMTP_USER_NAME=${SMTP_USER_NAME} - - SMTP_PASSWORD=${SMTP_PASSWORD} - LLM_TEMPERATURE=${LLM_TEMPERATURE} - CHUNK_SIZE=${CHUNK_SIZE} - CHUNK_OVERLAP=${CHUNK_OVERLAP} @@ -80,10 +76,6 @@ services: - LLM_MODEL=${LLM_MODEL} - CHECK_MODEL=${CHECK_MODEL} - EMBEDDING_MODEL=${EMBEDDING_MODEL} - - SMTP_ADDRESS=${SMTP_ADDRESS} - - SMTP_PORT=${SMTP_PORT} - - SMTP_USER_NAME=${SMTP_USER_NAME} - - SMTP_PASSWORD=${SMTP_PASSWORD} - LLM_TEMPERATURE=${LLM_TEMPERATURE} - CHUNK_SIZE=${CHUNK_SIZE} - CHUNK_OVERLAP=${CHUNK_OVERLAP}