diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0526f2d7..371ad6b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,8 +52,8 @@ jobs: # deploy static files and migrate database docker compose exec django python manage.py collectstatic --no-input docker compose exec django python manage.py migrate --no-input - docker-compose exec django python manage.py populate_users - docker-compose exec django python manage.py populate_data + docker compose exec django python manage.py populate_users + docker compose exec django python manage.py populate_data - name: Run unit tests run: | diff --git a/scripts/restart.sh b/scripts/restart.sh index 6cad7ff5..93a05591 100755 --- a/scripts/restart.sh +++ b/scripts/restart.sh @@ -10,15 +10,16 @@ FULL=$1 export COMPOSE_FILE=docker-compose.dev.yml:docker-compose.yml -docker-compose down --volumes || true +docker compose down --volumes || true -docker-compose up --build -d +docker compose up --build -d sleep 5 if [[ $FULL == "reset" ]];then - docker-compose exec django python manage.py makemigrations - docker-compose exec django python manage.py migrate + docker compose exec django python manage.py makemigrations + docker compose exec django python manage.py migrate fi -docker-compose exec django python manage.py collectstatic --no-input -docker-compose exec django python manage.py populate +docker compose exec django python manage.py collectstatic --no-input +docker compose exec django python manage.py populate_users +docker compose exec django python manage.py populate_data