From 5e4950563c37b0ad83301640c895c934b817d013 Mon Sep 17 00:00:00 2001 From: DigiServer Developer Date: Mon, 11 Aug 2025 17:01:58 +0300 Subject: [PATCH] Fix admin authentication and update port mapping - Fix environment variable mismatch in create_default_user.py - Now correctly uses ADMIN_USER and ADMIN_PASSWORD from docker-compose - Maintains backward compatibility with DEFAULT_USER and DEFAULT_PASSWORD - Change port mapping from 8880 to 80 for easier access - Resolves login issues with admin user credentials --- app/models/create_default_user.py | 5 +++-- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/create_default_user.py b/app/models/create_default_user.py index 1e8d2fa..6c5b24b 100644 --- a/app/models/create_default_user.py +++ b/app/models/create_default_user.py @@ -2,8 +2,9 @@ import os def create_default_user(db, User, bcrypt): - username = os.getenv('DEFAULT_USER', 'admin') - password = os.getenv('DEFAULT_PASSWORD', '1234') + # Use ADMIN_USER and ADMIN_PASSWORD to match docker-compose environment variables + username = os.getenv('ADMIN_USER', os.getenv('DEFAULT_USER', 'admin')) + password = os.getenv('ADMIN_PASSWORD', os.getenv('DEFAULT_PASSWORD', '1234')) hashed_password = bcrypt.generate_password_hash(password).decode('utf-8') existing_user = User.query.filter_by(username=username).first() if not existing_user: diff --git a/docker-compose.yml b/docker-compose.yml index ec0f2da..3ac68c7 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: image: digiserver:latest container_name: digiserver ports: - - "8880:5000" + - "80:5000" environment: - FLASK_APP=app.py - FLASK_RUN_HOST=0.0.0.0