diff --git a/app/__init__.py b/app/__init__.py index e91b63c196082e48173e43cabf1b349bfd3d3490..56be70a16f531268cf118eb2568772df1a529329 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -26,7 +26,8 @@ def create_app(config_class=Config): db_password = os.getenv("DATABASE_PASSWORD") db_name = os.getenv("DATABASE_NAME") - app.config['SQLALCHEMY_DATABASE_URI'] = f"mysql+pymysql://{db_user}:{db_password}@{db_host}/{db_name}".format(db_user=db_user, db_password=db_password, db_name=db_name) + app.config['SQLALCHEMY_DATABASE_URI'] = f"mysql+pymysql://{db_user}:{db_password}@{db_host}/{db_name}".format(db_user=db_user, db_password=db_password, db_host=db_host, db_name=db_name) + print(app.config['SQLALCHEMY_DATABASE_URI']) db.init_app(app) #Run Flask migrations if any available diff --git a/compose.yaml b/compose.yaml index ef37276f64c42e55557784f1e848428308b17b51..077859bc44e4b62d0dfc0e373e0a83e3d276dc2b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,15 +7,16 @@ services: ports: - '5000:5000' volumes: - - ./app:/flask/app - # environment: - # - FLASK_APP=app:create_app - # - DATABASE_HOST=database - # - DATABASE_USER=user - # - DATABASE_PASSWORD=userpassword - # - DATABASE_NAME=mydatabase + - ./app:/flask/app depends_on: - database + networks: + - network + environment: + DB_HOST: database + DB_USER: user + DB_PASSWORD: userpassword + DB_NAME: mydatabase database: image: mysql:8.3 @@ -28,6 +29,12 @@ services: MYSQL_PASSWORD: userpassword volumes: - mysql_data:/var/lib/mysql + networks: + - network volumes: - mysql_data: \ No newline at end of file + mysql_data: + +networks: + network: + driver: bridge diff --git a/requirements.txt b/requirements.txt index e2f926676cb7cace9de0bb841101a6fcda60bacd..bb63d03fa549d6220141f2719dd7ed3a29674db4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ flask_sqlalchemy flask_migrate pymysql python-dotenv -jinja2==3.0.0 -jinja2 markupsafe \ No newline at end of file +jinja2 +cryptography \ No newline at end of file