diff --git a/Dockerfile b/Dockerfile index 34d152e..c616099 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,13 @@ FROM alpine:3.8 -RUN apk add --update --no-cache python3 && \ - pip3 install flask requests && \ +ADD ["./requirements.txt", "/requirements.txt"] +RUN apk add --update --no-cache python3 postgresql-dev py3-psycopg2 && \ + pip3 install -r /requirements.txt && \ + rm /requirements.txt && \ adduser -D app -ADD ["ics_merger.py","/"] +ADD ["src","/"] -CMD ["python3", "-u", "/ics_merger.py"] +CMD ["python3", "-u", "/main.py"] -EXPOSE 8080 +EXPOSE 5000 USER app diff --git a/docker-compose.yml b/docker-compose.yml index 1e1dded..f0be0fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,14 @@ version: "3" +networks: + db_net: + external: true + services: - ics_merger: - build: . - image: docker.wiai.de/fswiai/ics_merger:0.1 - ports: - - 8080:8080 + codimd_note_overview: + build: . + image: docker.wiai.de/fswiai/codimd_notes_overview:0.1 + ports: + - 8080:5000 + networks: + - db_net diff --git a/main.py b/main.py deleted file mode 100644 index 687893d..0000000 --- a/main.py +++ /dev/null @@ -1,27 +0,0 @@ -import psycopg2 -from flask import Flask, render_template - -app = Flask(__name__) -app.debug = True - -sql_statement = 'SELECT "id","title","alias","shortid","viewcount","lastchangeAt" FROM "Notes" ORDER BY "lastchangeAt" DESC;' -DB_HOST = '192.168.0.3' -DB_Name = 'hackmd' -DB_USER = 'hackmd' -DB_PASSWORD = 'osHx34e4aDazGsER' -CODI_URL = "https://hackmd.wiai.de" - - -@app.route("/") -def main(): - conn = psycopg2.connect(host=DB_HOST, database=DB_Name, user=DB_USER, password=DB_PASSWORD) - cur = conn.cursor() - cur.execute(sql_statement) - notes = cur.fetchall() - cur.close() - conn.close() - return render_template('index.html', notes=notes, host=CODI_URL) - - -if __name__ == '__main__': - app.run() diff --git a/src/main.py b/src/main.py new file mode 100644 index 0000000..7316e26 --- /dev/null +++ b/src/main.py @@ -0,0 +1,26 @@ +import psycopg2 +import config +from flask import Flask, render_template + +app = Flask(__name__) +app.debug = True + +sql_statement = 'SELECT "id","title","alias","shortid","viewcount","lastchangeAt" FROM "Notes" ORDER BY "lastchangeAt" DESC;' + + +@app.route("/") +def main(): + try: + conn = psycopg2.connect(host=config.DB_HOST, database=config.DB_Name, user=config.DB_USER, password=config.DB_PASSWORD) + cur = conn.cursor() + cur.execute(sql_statement) + notes = cur.fetchall() + cur.close() + conn.close() + return render_template('index.html', notes=notes, host=config.CODI_URL) + except Exception as e: + return render_template('index.html') + + +if __name__ == '__main__': + app.run(host='0.0.0.0', port=5000) diff --git a/static/js/sort.js b/src/static/js/sort.js similarity index 100% rename from static/js/sort.js rename to src/static/js/sort.js diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.css b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.css similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.css rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.css diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.css.map b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.css.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.css.map rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.css.map diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.min.css b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.min.css similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.min.css rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.min.css diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.min.css.map b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.min.css.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.min.css.map rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-grid.min.css.map diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.css b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.css similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.css rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.css diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.css.map b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.css.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.css.map rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.css.map diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.min.css b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.min.css similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.min.css rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.min.css diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.min.css.map b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.min.css.map rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap-reboot.min.css.map diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap.css b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap.css similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap.css rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap.css diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap.css.map b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap.css.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap.css.map rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap.css.map diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap.min.css b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap.min.css similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap.min.css rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap.min.css diff --git a/static/libs/bootstrap-4.1.3-dist/css/bootstrap.min.css.map b/src/static/libs/bootstrap-4.1.3-dist/css/bootstrap.min.css.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/css/bootstrap.min.css.map rename to src/static/libs/bootstrap-4.1.3-dist/css/bootstrap.min.css.map diff --git a/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.js b/src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.js similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.js rename to src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.js diff --git a/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.js.map b/src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.js.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.js.map rename to src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.js.map diff --git a/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.min.js b/src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.min.js similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.min.js rename to src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.min.js diff --git a/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.min.js.map b/src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.min.js.map rename to src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.bundle.min.js.map diff --git a/static/libs/bootstrap-4.1.3-dist/js/bootstrap.js b/src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.js similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/js/bootstrap.js rename to src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.js diff --git a/static/libs/bootstrap-4.1.3-dist/js/bootstrap.js.map b/src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.js.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/js/bootstrap.js.map rename to src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.js.map diff --git a/static/libs/bootstrap-4.1.3-dist/js/bootstrap.min.js b/src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.min.js similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/js/bootstrap.min.js rename to src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.min.js diff --git a/static/libs/bootstrap-4.1.3-dist/js/bootstrap.min.js.map b/src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.min.js.map similarity index 100% rename from static/libs/bootstrap-4.1.3-dist/js/bootstrap.min.js.map rename to src/static/libs/bootstrap-4.1.3-dist/js/bootstrap.min.js.map diff --git a/static/libs/bootstrap.css b/src/static/libs/bootstrap.css similarity index 100% rename from static/libs/bootstrap.css rename to src/static/libs/bootstrap.css diff --git a/static/libs/bootstrap.min.css b/src/static/libs/bootstrap.min.css similarity index 100% rename from static/libs/bootstrap.min.css rename to src/static/libs/bootstrap.min.css diff --git a/templates/index.html b/src/templates/index.html similarity index 100% rename from templates/index.html rename to src/templates/index.html