diff --git a/.gitignore b/.gitignore index f003d00..7d5c57a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ secrets.ini # Own settings settings.ini # Database -*.db +*.sqlite # Flask-Migrate /migrations/ diff --git a/Containerfile b/Containerfile index 7a62a4a..c13a963 100644 --- a/Containerfile +++ b/Containerfile @@ -10,4 +10,4 @@ RUN pip3 install -r requirements.txt COPY . . -CMD ["gunicorn", "--bind", "0.0.0.0:80", "--workers", "5", "--log-file", "/volumes/logs/gunicorn.log", "run:create_app()"] \ No newline at end of file +CMD ["/bin/bash", "init.sh"] \ No newline at end of file diff --git a/advlabdb/config.py b/advlabdb/config.py index 71cfd79..4dca911 100644 --- a/advlabdb/config.py +++ b/advlabdb/config.py @@ -53,7 +53,7 @@ def set_config(app, data_dir: Path): app.config["SECRET_KEY"] = secrets["SECRET_KEY"] # SQLALCHEMY - db_file = data_dir / "db/advlab.db" + db_file = data_dir / "db/advlabdb.sqlite" db_file.parent.mkdir(parents=True, exist_ok=True) app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_file}" diff --git a/advlabdb/database_import.py b/advlabdb/database_import.py index 31efcfc..fe3649c 100644 --- a/advlabdb/database_import.py +++ b/advlabdb/database_import.py @@ -48,7 +48,7 @@ def not_nullable(entry): def importFromFile(filePath: Path): - db_path = data_dir / "db/advlab.db" + db_path = data_dir / "db/advlabdb.sqlite" db_bk_dir = db_path.parent / "backups" db_bk_dir.mkdir(exist_ok=True) @@ -331,7 +331,7 @@ def importFromFile(filePath: Path): db.session.add(dbAppointment) # Backup - dest = db_bk_dir / f"before_{dbSemester}_import_{now()}.db" + dest = db_bk_dir / f"before_{dbSemester}_import_{now()}.sqlite" copy2(db_path, dest) flash(f"Made a backup of the database before committing the import at {dest}") @@ -342,7 +342,7 @@ def importFromFile(filePath: Path): raise ex - dest = db_bk_dir / f"after_{dbSemester}_import_{now()}.db" + dest = db_bk_dir / f"after_{dbSemester}_import_{now()}.sqlite" copy2(db_path, dest) flash(f"Made a backup of the database after the import at {dest}") diff --git a/cli/setup/init_db/main.py b/cli/setup/init_db/main.py index f7eb1f7..f8fcd48 100644 --- a/cli/setup/init_db/main.py +++ b/cli/setup/init_db/main.py @@ -17,7 +17,7 @@ class EmailParamType(click.ParamType): def _init_db(manage): - db_file = data_dir / "db/advlab.db" + db_file = data_dir / "db/advlabdb.sqlite" if db_file.is_file(): click.echo(f"Skipping database initialization because the database does already exist at {db_file}.") return diff --git a/cli/test/generate_test_db/main.py b/cli/test/generate_test_db/main.py index 14d9ee5..91145a1 100644 --- a/cli/test/generate_test_db/main.py +++ b/cli/test/generate_test_db/main.py @@ -33,7 +33,7 @@ def db_add(obj): def _generate_test_db(): - db_file = data_dir / "db/advlab.db" + db_file = data_dir / "db/advlabdb.sqlite" if db_file.is_file(): click.echo( click.style( diff --git a/init.sh b/init.sh new file mode 100644 index 0000000..b840505 --- /dev/null +++ b/init.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Generate secrets if the secrets file does not already exist +./manage.py setup generate-secrets + +# Start the server +gunicorn --bind "0.0.0.0:80" --workers "5" --log-file "/volumes/logs/gunicorn.log" "run:create_app()"