diff --git a/dockercont/Dockerfile b/dockercont/Dockerfile index 944e91df2d25e38234a1d754d807d45912b510aa..2703e8c92effde349f74ed2198e10bcfdb9d13a8 100644 --- a/dockercont/Dockerfile +++ b/dockercont/Dockerfile @@ -1,4 +1,6 @@ FROM tiangolo/uwsgi-nginx-flask:python3.6 RUN pip install peewee +RUN pip install mysql RUN git clone https://gitlab.warpzone.ms/mowoe/chaos_familien_duell_frontend.git /zwisch +ADD creds.json /app/ RUN mv /zwisch/* /app diff --git a/main.py b/main.py index 85ce42bbc5ffa1a6fe1d22fac965061202b2857b..6fc96a63bc354662315c7e394530be4b9cfed717 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,7 @@ from flask import Flask from view.questions import questions +from model import Question +import json from model import Question diff --git a/model/__init__.py b/model/__init__.py index 230d3c2c368b7d2dc82a337b9b83ba1b0edd4c68..98220499fe6b6784c84842dfa00794bbcf5dcbbb 100644 --- a/model/__init__.py +++ b/model/__init__.py @@ -1,8 +1,15 @@ from peewee import SqliteDatabase from peewee import Model +from peewee import MySQLDatabase +import json -sqlite = SqliteDatabase("model/cfd.sqlite", pragmas={'foreign_keys': 1}) +mysql_creds = json.load(open("./creds.json")) + +sqlite = SqliteDatabase("static/cfd.sqlite", pragmas={'foreign_keys': 1}) sqlite.connect() +#sqlite = MySQLDatabase(mysql_creds["db"], user=mysql_creds["user"], password=mysql_creds['password'], +# host=mysql_creds['host'], port=int(mysql_creds['port']),) + class BaseModel(Model): diff --git a/model/sample_creds.json b/model/sample_creds.json new file mode 100644 index 0000000000000000000000000000000000000000..04f626029532306640acee267d396b50db6cd834 --- /dev/null +++ b/model/sample_creds.json @@ -0,0 +1,3 @@ +{ + "host":"","user":"","password":"","db":"","port":1337 +} \ No newline at end of file