From 564a2c61dfcd427c24cc8b08712fbf953ab1f6cd Mon Sep 17 00:00:00 2001 From: Sam Hadow Date: Sun, 28 Jan 2024 22:33:42 +0100 Subject: [PATCH] container env variables for db --- Dockerfile | 3 +++ podman-commands | 2 +- src/app.py | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1e52e2f..fef5efd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,4 +16,7 @@ WORKDIR /app EXPOSE 8080 +ENV POSTGRES_HOST=127.0.0.1 +ENV POSTGRES_PORT=5432 + CMD ["gunicorn","--config", "gunicorn_config.py", "app:app"] diff --git a/podman-commands b/podman-commands index 58e64d4..5195d60 100644 --- a/podman-commands +++ b/podman-commands @@ -5,4 +5,4 @@ podman pod create --name aliexpress -p 8080:8080 podman run -d --pod=aliexpress -e POSTGRES_DB="aliexpress" -e POSTGRES_USER="postgres" -e POSTGRES_PASSWORD="postgres" -v /home/fire/Downloads/db:/var/lib/postgresql/data --name ali-db docker.io/postgres -podman run -d --pod=aliexpress --name ali-app alipricetrack:1.0.0 +podman run -d --pod=aliexpress -e POSTGRES_DB="aliexpress" -e POSTGRES_USER="postgres" -e POSTGRES_PASSWORD="postgres" --name ali-app alipricetrack:1.0.0 diff --git a/src/app.py b/src/app.py index 14886ae..9ab539c 100644 --- a/src/app.py +++ b/src/app.py @@ -7,8 +7,17 @@ app = Flask(__name__) def get_conf(): '''return settings in settings.yaml file''' + settings = dict() with open(os.path.dirname(os.path.realpath(__file__))+"/settings.yaml", 'r') as conf_file: settings = yaml.safe_load(conf_file) + settings["db"] = { + "host": os.environ.get('POSTGRES_HOST'), + "port": os.environ.get('POSTGRES_PORT'), + "database": os.environ.get('POSTGRES_DB'), + "user": os.environ.get('POSTGRES_USER'), + "password": os.environ.get('POSTGRES_PASSWORD') + } + return settings @app.route('/init')