From 4b8396a3bc5fc369d9048d1aae24c24bc7f51324 Mon Sep 17 00:00:00 2001 From: Kobe Date: Mon, 26 May 2025 15:58:45 +0200 Subject: [PATCH] set up docker env --- app.py | 4 +++- docker-compose.yml | 2 ++ stack.env | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app.py b/app.py index a1e040b..224689f 100644 --- a/app.py +++ b/app.py @@ -20,7 +20,9 @@ def create_app(): app = Flask(__name__) # Configure the database - app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE_URL', 'postgresql://postgres:postgres@db:5432/docupulse') + # Use 'db' as host when running in Docker, 'localhost' for local development + db_host = 'db' if os.getenv('DOCKER_ENV') else 'localhost' + app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE_URL', f'postgresql://postgres:1253@{db_host}:5432/docupulse') app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SECRET_KEY'] = os.getenv('SECRET_KEY', 'your-secret-key-here') app.config['UPLOAD_FOLDER'] = os.path.join(app.root_path, 'static', 'uploads') diff --git a/docker-compose.yml b/docker-compose.yml index 99da74d..9060a04 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,8 @@ services: - ./uploads:/app/uploads env_file: - stack.env + environment: + - DOCKER_ENV=true depends_on: - db diff --git a/stack.env b/stack.env index 1be9481..4aa6b9c 100644 --- a/stack.env +++ b/stack.env @@ -2,10 +2,10 @@ FLASK_APP=app.py FLASK_ENV=production UPLOAD_FOLDER=/app/uploads -DATABASE_URL=postgresql://postgres:postgres@db:5432/docupulse +DATABASE_URL=postgresql://postgres:1253@localhost:5432/docupulse SECRET_KEY=your-secure-secret-key-here # Database service environment variables POSTGRES_USER=postgres -POSTGRES_PASSWORD=postgres +POSTGRES_PASSWORD=1253 POSTGRES_DB=docupulse \ No newline at end of file