| @@ -0,0 +1,9 @@ | |||||
| FROM python:2.7 | |||||
| COPY . /app | |||||
| WORKDIR app | |||||
| RUN pip install -r requirements.txt | |||||
| ENTRYPOINT [ "python", "run.py" ] | |||||
| @@ -1,7 +1,9 @@ | |||||
| import sqlite3 | import sqlite3 | ||||
| import os | |||||
| from flask import json, g | from flask import json, g | ||||
| db_root=os.getenv("DB_ROOT", "") | |||||
| db_location=db_root + '/craftbeerpi.db' | |||||
| def get_db(): | def get_db(): | ||||
| db = getattr(g, '_database', None) | db = getattr(g, '_database', None) | ||||
| @@ -11,7 +13,7 @@ def get_db(): | |||||
| for idx, col in enumerate(cursor.description): | for idx, col in enumerate(cursor.description): | ||||
| d[col[0]] = row[idx] | d[col[0]] = row[idx] | ||||
| return d | return d | ||||
| db = g._database = sqlite3.connect('craftbeerpi.db') | |||||
| db = g._database = sqlite3.connect(db_location) | |||||
| db.row_factory = dict_factory | db.row_factory = dict_factory | ||||
| return db | return db | ||||
| @@ -1,14 +1,14 @@ | |||||
| import sqlite3 | import sqlite3 | ||||
| import os | import os | ||||
| from modules import cbpi | from modules import cbpi | ||||
| from db import get_db | |||||
| from db import get_db, db_location | |||||
| def execute_file(curernt_version, data): | def execute_file(curernt_version, data): | ||||
| if curernt_version >= data["version"]: | if curernt_version >= data["version"]: | ||||
| cbpi.app.logger.info("SKIP DB FILE: %s" % data["file"]) | cbpi.app.logger.info("SKIP DB FILE: %s" % data["file"]) | ||||
| return | return | ||||
| try: | try: | ||||
| with sqlite3.connect("craftbeerpi.db") as conn: | |||||
| with sqlite3.connect(db_location) as conn: | |||||
| with open('./update/%s' % data["file"], 'r') as f: | with open('./update/%s' % data["file"], 'r') as f: | ||||
| d = f.read() | d = f.read() | ||||
| sqlCommands = d.split(";") | sqlCommands = d.split(";") | ||||