From 35a977536b21a84e8c708e60447afbaa64774507 Mon Sep 17 00:00:00 2001 From: "Choi A.K." Date: Thu, 18 Sep 2025 15:30:43 +0900 Subject: [PATCH] docker-compose fix --- docker-compose.temp.yml | 45 +++++++++++++++++++++++ src/premium/add-premium-columns-direct.js | 14 ++++--- src/premium/add-premium-columns.ts | 2 +- 3 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 docker-compose.temp.yml diff --git a/docker-compose.temp.yml b/docker-compose.temp.yml new file mode 100644 index 0000000..2017b71 --- /dev/null +++ b/docker-compose.temp.yml @@ -0,0 +1,45 @@ +[36mВведите параметры подключения к внешней базе данных:[0m +Хост (например, localhost): Порт (например, 5432): Имя базы данных: Имя пользователя: Пароль: [33mМодифицируем docker-compose.yml для работы с внешней базой данных...[0m +஢ 䠩: 0. +version: '3.8' + +services: + bot: + build: . + container_name: telegram-tinder-bot + restart: unless-stopped + env_file: .env + environment: + - NODE_ENV=production + - DB_HOST= + - DB_PORT= + - DB_NAME= + - DB_USERNAME= + - DB_PASSWORD= + volumes: + - ./uploads:/app/uploads + - ./logs:/app/logs + networks: + - bot-network + healthcheck: + test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/health"] + interval: 30s + timeout: 5s + retries: 3 + start_period: 10s + + adminer: + image: adminer:latest + container_name: adminer-tinder + restart: unless-stopped + ports: + - "8080:8080" + networks: + - bot-network + +volumes: + postgres_data: + +networks: + bot-network: + driver: bridge diff --git a/src/premium/add-premium-columns-direct.js b/src/premium/add-premium-columns-direct.js index d9ed2be..c59e8d7 100644 --- a/src/premium/add-premium-columns-direct.js +++ b/src/premium/add-premium-columns-direct.js @@ -3,13 +3,15 @@ const { Pool } = require('pg'); -// Настройки подключения к базе данных - используем те же настройки, что и раньше +// Настройки подключения к базе данных из переменных окружения +require('dotenv').config(); + const pool = new Pool({ - host: '192.168.0.102', - port: 5432, - database: 'telegram_tinder_bot', - user: 'trevor', - password: 'Cl0ud_1985!' + host: process.env.DB_HOST || 'localhost', + port: process.env.DB_PORT || 5432, + database: process.env.DB_NAME || 'telegram_tinder_bot', + user: process.env.DB_USERNAME || 'postgres', + password: process.env.DB_PASSWORD || '' }); async function addPremiumColumns() { diff --git a/src/premium/add-premium-columns.ts b/src/premium/add-premium-columns.ts index 82c721a..1cce17f 100644 --- a/src/premium/add-premium-columns.ts +++ b/src/premium/add-premium-columns.ts @@ -1,7 +1,7 @@ // add-premium-columns.ts // Скрипт для добавления колонок premium и premium_expires_at в таблицу users -import { query } from '../src/database/connection'; +import { query } from '../database/connection'; async function addPremiumColumns() { try {