diff --git a/docker-compose.yml b/docker-compose.yml index 128433d..41d3960 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: db: - image: postgres:16 + image: postgres:13 volumes: - "./data/db/pgdata:/var/lib/postgresql/data/" env_file: @@ -13,11 +13,11 @@ services: pgadmin: image: dpage/pgadmin4 volumes: - - "./data/dbadmin:/var/lib/pgadmin" + - "./data/dbadmin/pgadmin:/var/lib/pgadmin" env_file: - ./.env - expose: - - 5050 + ports: + - 5050:5050 restart: always networks: - internal @@ -28,8 +28,8 @@ services: context: ./flask dockerfile: Dockerfile command: gunicorn --bind 0.0.0.0:5000 manage:app - expose: - - 5000 + ports: + - 5000:5000 env_file: - ./.env networks: @@ -43,11 +43,11 @@ services: - "DOWNLOAD_PBF=https://download.geofabrik.de/europe/bulgaria-latest.osm.pbf" - "DOWNLOAD_POLY=https://download.geofabrik.de/europe/bulgaria.poly" volumes: - - "./data/osmtile:/data/database/" + - "./data/osmtile/pgdata:/data/database/" command: "run" #command: "import" - expose: - - 8000 + ports: + - 80:8000 networks: - internal restart: always diff --git a/flask/forest/__init__.py b/flask/forest/__init__.py index c013629..81c5078 100644 --- a/flask/forest/__init__.py +++ b/flask/forest/__init__.py @@ -1,6 +1,8 @@ import os import sys +from json import JSONEncoder + from werkzeug.utils import secure_filename from flask import ( Flask, @@ -11,9 +13,7 @@ from flask import ( redirect, url_for ) -from flask_sqlalchemy import SQLAlchemy - -from flask.json import JSONEncoder +#from flask_sqlalchemy import SQLAlchemy from flask_bootstrap import Bootstrap from flask_mail import Mail from flask_login import LoginManager