From da93e2a4b25267fe62b75092c401379fb56f6f62 Mon Sep 17 00:00:00 2001 From: Errormacr Date: Sat, 25 Nov 2023 18:59:13 +0300 Subject: [PATCH] fix some problem, can't connect --- backend/config/index.ts | 2 +- docker-compose.yml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/backend/config/index.ts b/backend/config/index.ts index c359859..6f037ce 100644 --- a/backend/config/index.ts +++ b/backend/config/index.ts @@ -8,7 +8,7 @@ export const config = { host: process.env.DATABASE_HOST || 'localhost', port: +process.env.DATABASE_PORT || 5432, username: process.env.DATABASE_USERNAME || 'postgres', - password: process.env.DATABASE_PASSWORD || '', + password: process.env.DATABASE_PASSWORD || 'postgres', database: process.env.DATABASE_DB || 'bot_db', synchronize: true, logging: false, diff --git a/docker-compose.yml b/docker-compose.yml index 6a2b2f6..af57012 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,13 +13,21 @@ services: - "${DATABASE_PORT}:5432" env_file: - .env + networks: + - labnet volumes: - neuro_postgres_db:/var/lib/postgresql/data restart: always backend: - container_name: neuro_front + container_name: neuro_backend build: ./backend stdin_open: true + environment: + - DATABASE_HOST='db' + - DATABASE_PORT=${DATABASE_PORT} + - DATABASE_USERNAME=${DATABASE_USER} + - DATABASE_PASSWORD=${DATABASE_PASSWORD} + - DATABASE_DB=${DATABASE_NAME} networks: - labnet volumes: @@ -34,4 +42,4 @@ volumes: neuro_postgres_db: driver: local networks: - labnet: \ No newline at end of file + labnet: {} \ No newline at end of file