diff --git a/.gitignore b/.gitignore index db73d22..e763d06 100644 --- a/.gitignore +++ b/.gitignore @@ -165,4 +165,8 @@ Caddy/data/ Caddy/config/ # Remove Highscore-Server generated files -Highscore-Server/data/ \ No newline at end of file +Highscore-Server/data/ +Highscore-Server/logs/ + +# Remove Postgres generated files +Postgres/data/ diff --git a/Highscore-Server/highscore/config.py b/Highscore-Server/highscore/config.py index 58b0e25..dc7c0d8 100644 --- a/Highscore-Server/highscore/config.py +++ b/Highscore-Server/highscore/config.py @@ -4,7 +4,7 @@ import os def env(key): return os.getenv(key) -SECRET_KEY = env('SECRET_KEY') +SECRET_KEY = env('FLASK_KEY') BEARER_TOKEN = env('BEARER_TOKEN') user = env('DB_USER') diff --git a/Highscore-Server/highscore/run.sh b/Highscore-Server/highscore/run.sh index bf936ad..47a7f51 100644 --- a/Highscore-Server/highscore/run.sh +++ b/Highscore-Server/highscore/run.sh @@ -9,7 +9,8 @@ done echo "Database is ready! Creating tables..." flask --app server db init -if [ -n flask --app server db check ]; then +if [ -n $(flask --app server db check) ] +then echo "Database changes detected! Migrating..." flask --app server db migrate flask --app server db upgrade diff --git a/docker-compose.yml b/docker-compose.yml index f34d878..31efee0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: ports: - 5432:5432 volumes: - - ./Postgress/data:/var/lib/postgresql/data + - ./Postgres/data:/var/lib/postgresql/data environment: POSTGRES_USER: root POSTGRES_PASSWORD: secret