diff --git a/docker-compose.yml b/docker-compose.yml index 260c2e371b44459de70ff74b93639224005d896c..8e81a07bc8c7cfbd7741f6296d7eb7ef008bc5a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: stdin_open: true tty: true volumes: - - $PWD/mc_frontend/www:/home/mc/mc_frontend/www + - ./mc_frontend/www:/home/mc/mc_frontend/www mcserver: build: context: ./mc_backend @@ -58,7 +58,7 @@ services: - "8100:80" restart: always volumes: - - $PWD/mc_frontend/www:/usr/share/nginx/html + - ./mc_frontend/www:/usr/share/nginx/html - ./mc_frontend/nginx.conf:/etc/nginx/nginx.conf volumes: db-data: diff --git a/mc_backend/mcserver/app/__init__.py b/mc_backend/mcserver/app/__init__.py index 11c564a9c41b5f04027420d444b1c08db47dce9f..10ca0d97e5c97658e4c9c415de1b2906ea21c51a 100644 --- a/mc_backend/mcserver/app/__init__.py +++ b/mc_backend/mcserver/app/__init__.py @@ -67,6 +67,7 @@ def full_init(app: Flask, is_csm: bool) -> None: from mcserver.app.services import CustomCorpusService if is_csm: from mcserver.app.services.databaseService import DatabaseService + DatabaseService.init_db_alembic() DatabaseService.init_db_update_info() DatabaseService.update_exercises(is_csm=is_csm) DatabaseService.init_db_corpus() @@ -90,8 +91,6 @@ def init_app_common(cfg: Type[Config] = Config, is_csm: bool = False) -> Flask: db.init_app(app) migrate.init_app(app, db) db.create_all() - from mcserver.app.services.databaseService import DatabaseService - DatabaseService.init_db_alembic() from mcserver.app.services.textService import TextService TextService.init_proper_nouns_list() TextService.init_stop_words_latin()