peterstockings/bloodpressure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use production config, and resolve issue with postgres url format (Unsure why this only surfaced after recreation of app)

Browse Source
This commit is contained in:
Peter Stockings
2024-12-26 01:33:14 +11:00
parent 4a1655dd44
commit ef2529d56e
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -43,5 +43,9 @@ COPY --from=tailwind-builder /app/app/static/css/tailwind.css ./app/static/css/t
# Expose the port Flask will run on # Expose the port Flask will run on
EXPOSE 5000 EXPOSE 5000
# Set environment variables
ENV FLASK_ENV=production
ENV FLASK_CONFIG=ProductionConfig
# Command to run the Flask app # Command to run the Flask app
CMD ["gunicorn", "-b", "0.0.0.0:5000", "app:create_app()"] CMD ["gunicorn", "-b", "0.0.0.0:5000", "app:create_app()"]

2
Readme.md
View File

@@ -28,7 +28,7 @@
### Run locally ### Run locally
`docker run -p 5000:5000 -e DATABASE_URL=postgresql://postgres:59fff56880e1bbb42e753d2a82ac21b6@peterstockings.com:15389/bloodpressure_db bloodpressure` `docker run -p 5000:5000 -e DATABASE_URL=postgres://postgres:59fff56880e1bbb42e753d2a82ac21b6@peterstockings.com:15389/bloodpressure_db bloodpressure`
# Fix deployment issues # Fix deployment issues

8
app/__init__.py
View File

@@ -1,3 +1,4 @@
import os
from flask import Flask from flask import Flask
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from flask_migrate import Migrate from flask_migrate import Migrate
@@ -13,9 +14,12 @@ login_manager = LoginManager()
login_manager.login_view = 'auth.login' login_manager.login_view = 'auth.login'
login_manager.login_message_category = 'info' login_manager.login_message_category = 'info'
def create_app(config_class='app.config.DevelopmentConfig'): def create_app():
app = Flask(__name__) app = Flask(__name__)
app.config.from_object(config_class)
# Load configuration
config_name = os.getenv('FLASK_CONFIG', 'DevelopmentConfig') # Default to DevelopmentConfig
app.config.from_object(f'app.config.{config_name}')
# Initialize extensions # Initialize extensions
db.init_app(app) db.init_app(app)

6
app/config.py
View File

@@ -9,17 +9,17 @@ class DevelopmentConfig(Config):
"""Development configuration.""" """Development configuration."""
DEBUG = True DEBUG = True
uri = os.environ.get('DATABASE_URL', 'postgresql://postgres:59fff56880e1bbb42e753d2a82ac21b6@peterstockings.com:15389/bloodpressure_db') uri = os.environ.get('DATABASE_URL', 'postgres://postgres:59fff56880e1bbb42e753d2a82ac21b6@peterstockings.com:15389/bloodpressure_db')
if uri and uri.startswith("postgres://"): if uri and uri.startswith("postgres://"):
uri = uri.replace("postgres://", "postgresql://", 1) uri = uri.replace("postgres://", "postgresql://", 1)
SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL', 'postgresql://postgres:59fff56880e1bbb42e753d2a82ac21b6@peterstockings.com:15389/bloodpressure_db') SQLALCHEMY_DATABASE_URI = uri
class ProductionConfig(Config): class ProductionConfig(Config):
"""Production configuration.""" """Production configuration."""
DEBUG = False DEBUG = False
uri = os.environ.get('DATABASE_URL', 'postgresql://postgres:59fff56880e1bbb42e753d2a82ac21b6@peterstockings.com:15389/bloodpressure_db') uri = os.environ.get('DATABASE_URL', 'postgres://postgres:59fff56880e1bbb42e753d2a82ac21b6@peterstockings.com:15389/bloodpressure_db')
if uri and uri.startswith("postgres://"): if uri and uri.startswith("postgres://"):
uri = uri.replace("postgres://", "postgresql://", 1) uri = uri.replace("postgres://", "postgresql://", 1)