From 20f219793d828e821bd315e2f174dce584dee868 Mon Sep 17 00:00:00 2001 From: Leonora Tindall Date: Mon, 9 Sep 2019 17:03:34 -0500 Subject: [PATCH] Add database connection handling with dummy usage --- database/Dockerfile | 6 +++--- webserver/Dockerfile | 1 + webserver/src/config.py | 5 +++++ webserver/src/database.py | 15 +++++++++++++++ webserver/src/webserver.py | 4 +++- 5 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 webserver/src/config.py create mode 100644 webserver/src/database.py diff --git a/database/Dockerfile b/database/Dockerfile index 0d63a3c..5f9cf9c 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -1,7 +1,7 @@ FROM postgres:11 -ENV POSTGRES_USER flittr -ENV POSTGRES_PASSWORD flittr -ENV POSTGRES_DB flittr +ENV POSTGRES_USER codepage +ENV POSTGRES_PASSWORD codepage +ENV POSTGRES_DB codepage ENV PGDATA /var/lib/postgresql/data/pgdata VOLUME /var/lib/postgresql/data/pgdata diff --git a/webserver/Dockerfile b/webserver/Dockerfile index 4c63f8c..2f9b97e 100644 --- a/webserver/Dockerfile +++ b/webserver/Dockerfile @@ -1,5 +1,6 @@ FROM python:3 RUN pip install -U Flask +RUN pip install psycopg2 WORKDIR / ADD ./src/ /src/ CMD ["python", "/src/webserver.py"] diff --git a/webserver/src/config.py b/webserver/src/config.py new file mode 100644 index 0000000..e990aa9 --- /dev/null +++ b/webserver/src/config.py @@ -0,0 +1,5 @@ +DB_NAME = "codepage" +DB_USER = "codepage" +DB_PASS = "codepage" +DB_HOST = "database" +DB_PORT = 5432 diff --git a/webserver/src/database.py b/webserver/src/database.py new file mode 100644 index 0000000..a9168e4 --- /dev/null +++ b/webserver/src/database.py @@ -0,0 +1,15 @@ +""" +Database handling code for the CodePage +""" +import psycopg2 +import config + +def getdb(): + return psycopg2.connect( + dbname=config.DB_NAME, + user=config.DB_USER, + password=config.DB_PASS, + host=config.DB_HOST, + port=config.DB_PORT + ) + diff --git a/webserver/src/webserver.py b/webserver/src/webserver.py index 5df12b9..c82f9dc 100644 --- a/webserver/src/webserver.py +++ b/webserver/src/webserver.py @@ -1,10 +1,12 @@ from flask import Flask +from database import getdb app = Flask(__name__) @app.route("/") def hello(): - return "Hello, world" + with getdb() as db: + return "Hello, world" if __name__ == '__main__': app.run(debug=True, host='0.0.0.0')