From 9e4ee747757ec93069d76c7ebc51ae4989c09856 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Tue, 13 Jun 2023 00:27:10 +1000 Subject: [PATCH] made explicit the difference between development and conatiner in wrapper (and docker-compose) so that we can run FLASK on port 5000 using db on localhost 55432. bookdb_webdev is a container, running on port 5001 and using bookdb_dev container on port 5432 --- main.py | 2 +- wrapper.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 9393ed5..5ca1dd1 100644 --- a/main.py +++ b/main.py @@ -21,7 +21,7 @@ app = Flask(__name__) # local DB conn string if os.environ['FLASK_ENV'] == "production": DB_URL = 'postgresql+psycopg2://ddp:blahdeblah@bookdb:5432/library' -elif os.environ['FLASK_ENV'] == "development": +elif os.environ['FLASK_ENV'] == "container": DB_URL = 'postgresql+psycopg2://ddp:blahdeblah@bookdb_dev:5432/library' else: DB_URL = 'postgresql+psycopg2://ddp:blahdeblah@127.0.0.1:55432/library' diff --git a/wrapper.sh b/wrapper.sh index 795aa9d..bf00361 100755 --- a/wrapper.sh +++ b/wrapper.sh @@ -4,6 +4,6 @@ if [ "$FLASK_ENV" == "production" ]; then gunicorn --bind=0.0.0.0:443 --workers=2 --threads=2 --certfile /etc/letsencrypt/live/book.depaoli.id.au/fullchain.pem --keyfile /etc/letsencrypt/live/book.depaoli.id.au/privkey.pem main:app --env FLASK_ENV="production" --error-logfile gunicorn.error.log --access-logfile gunicorn.log --capture-output --enable-stdio-inheritance else cd /pybook_mapped_volume - gunicorn --bind=0.0.0.0:5000 --workers=1 --threads=1 main:app --env FLASK_ENV="development" --error-logfile gunicorn.error.log --access-logfile gunicorn.log --capture-output --enable-stdio-inheritance --reload + gunicorn --bind=0.0.0.0:5000 --workers=1 --threads=1 main:app --env FLASK_ENV="$FLASK_ENV" --error-logfile gunicorn.error.log --access-logfile gunicorn.log --capture-output --enable-stdio-inheritance --reload fi