diff --git a/CTFd/__init__.py b/CTFd/__init__.py index 714340c85b887f343bb3cf59300279429d39ba87..858df583a06894626e31a6bc3a485f60346993ac 100644 --- a/CTFd/__init__.py +++ b/CTFd/__init__.py @@ -249,13 +249,13 @@ def create_app(config="CTFd.config.Config"): db.create_all() - if not is_running_migration_command(): - stamp_latest_revision() - else: + # if not is_running_migration_command(): + # stamp_latest_revision() + # else: # This creates tables instead of db.create_all() # Allows migrations to happen properly - upgrade() + # upgrade() from CTFd.models import ma diff --git a/docker-compose.yml b/docker-compose.yml index 8a3a56ba3d0d27d4e592836d99ac1b52a3f555dc..280930d00d806d280cd609402343b364f13ccb5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,6 +95,7 @@ services: - MARIADB_PASSWORD=ctfd - MARIADB_DATABASE=ctfd - MARIADB_AUTO_UPGRADE=1 + - MYSQL_HOST=db volumes: - .data/mysql:/var/lib/mysql networks: diff --git a/migrations/alembic.ini b/migrations/alembic.ini index 358eb0e0d0dc52883f042e0ceb5daa6094456363..01ee20cae79c5a6835a558a83165c7f1fb49e96c 100644 --- a/migrations/alembic.ini +++ b/migrations/alembic.ini @@ -2,6 +2,7 @@ [alembic] script_location = . +sqlalchemy.url = mysql+pymysql://ctfd:ctfd@db/ctfd # template used to generate migration files # file_template = %%(rev)s_%%(slug)s diff --git a/migrations/env.py b/migrations/env.py index f98947724b9631b2d82f1a04c0a55856a29af341..ec3d6c442e74df71cbb39d68524398458596f7ef 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -27,7 +27,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../CTF from flask import current_app from CTFd import create_app -app = create_app() +app = create_app(config="CTFd.config.Config") with app.app_context(): config.set_main_option( "sqlalchemy.url",