From 5d357350c704e10c80116ef2ac213efbb56b9699 Mon Sep 17 00:00:00 2001
From: LpCote <73721863+LpCote4@users.noreply.github.com>
Date: Mon, 19 Aug 2024 03:53:09 -0400
Subject: [PATCH] data
---
CTFd/__init__.py | 8 ++++----
docker-compose.yml | 1 +
migrations/alembic.ini | 1 +
migrations/env.py | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CTFd/__init__.py b/CTFd/__init__.py
index 714340c8..858df583 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 8a3a56ba..280930d0 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 358eb0e0..01ee20ca 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 f9894772..ec3d6c44 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",
--
GitLab