diff --git a/Taskfile.yml b/Taskfile.yml index aee4ff23d..102c4ccb7 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -17,10 +17,10 @@ tasks: dir: tdrs-backend cmds: - task: create-network - - docker compose -f docker compose.yml up -d --build - - docker compose -f docker compose.yml exec web sh -c "python ./manage.py makemigrations" - - docker compose -f docker compose.yml exec web sh -c "python ./manage.py migrate" - - docker compose -f docker compose.yml down + - docker compose -f docker-compose.yml up -d --build + - docker compose -f docker-compose.yml exec web sh -c "python ./manage.py makemigrations" + - docker compose -f docker-compose.yml exec web sh -c "python ./manage.py migrate" + - docker compose -f docker-compose.yml down - task: sentry-down clone-sentry-repo: @@ -44,7 +44,7 @@ tasks: # add bash - docker exec sentry sh -c "apk add bash" - - docker cp docker compose.yml sentry:/self-hosted/docker compose.yml + - docker cp docker-compose.yml sentry:/self-hosted/docker-compose.yml - docker cp .env sentry:/self-hosted/.env - docker exec sentry bash -c "cd self-hosted && ./install.sh --skip-user-creation --no-report-self-hosted-issues" # create a new user @@ -75,44 +75,44 @@ tasks: desc: Drop the backend database dir: tdrs-backend cmds: - - docker compose -f docker compose.yml down + - docker compose -f docker-compose.yml down - docker volume rm tdrs-backend_postgres_data backend-up: desc: Start backend web server dir: tdrs-backend cmds: - - docker compose -f docker compose.yml up -d + - docker compose -f docker-compose.yml up -d backend-down: desc: Stop backend web server dir: tdrs-backend cmds: - - docker compose -f docker compose.yml down + - docker compose -f docker-compose.yml down backend-logs: desc: Show and follow backend web server logs dir: tdrs-backend cmds: - - docker compose -f docker compose.yml logs -f + - docker compose -f docker-compose.yml logs -f backend-restart: desc: Restart backend web server dir: tdrs-backend cmds: - - docker compose -f docker compose.yml restart + - docker compose -f docker-compose.yml restart backend-bash: desc: Open a shell in the backend container dir: tdrs-backend cmds: - - docker compose -f docker compose.yml exec web sh + - docker compose -f docker-compose.yml exec web sh backend-shell: desc: Open a Django shell in the backend container dir: tdrs-backend cmds: - - docker compose -f docker compose.yml exec web sh -c "python ./manage.py shell" + - docker compose -f docker-compose.yml exec web sh -c "python ./manage.py shell" backend-exec: desc: Execute a command in the backend container @@ -120,7 +120,7 @@ tasks: vars: CMD: '{{.CMD}}' cmds: - - docker compose -f docker compose.yml exec web sh -c "python manage.py {{.CMD}}" + - docker compose -f docker-compose.yml exec web sh -c "python manage.py {{.CMD}}" backend-exec-seed-db: desc: Execute seed_db command in the backend container @@ -128,8 +128,8 @@ tasks: vars: CMD: '{{.CMD}}' cmds: - - docker compose -f docker compose.yml up -d - - docker compose -f docker compose.yml exec web sh -c "python manage.py populate_stts; python ./manage.py seed_db" + - docker compose -f docker-compose.yml up -d + - docker compose -f docker-compose.yml exec web sh -c "python manage.py populate_stts; python ./manage.py seed_db" backend-pytest: desc: 'Run pytest in the backend container E.g: task backend-pytest PYTEST_ARGS="tdpservice/test/ -s -vv"' @@ -138,20 +138,20 @@ tasks: PYTEST_ARGS: '{{.PYTEST_ARGS | default "."}}' cmds: - task backend-up - - docker compose -f docker compose.yml exec web sh -c "pytest {{.PYTEST_ARGS}}" + - docker compose -f docker-compose.yml exec web sh -c "pytest {{.PYTEST_ARGS}}" backend-remove-volumes: desc: Remove the backend volumes dir: tdrs-backend cmds: - - docker compose -f docker compose.yml down -v + - docker compose -f docker-compose.yml down -v backend-lint: desc: Run flake8 in the backend container dir: tdrs-backend cmds: - task backend-up - - docker compose -f docker compose.yml exec -T web sh -c "flake8 . && if [ $? -eq 0 ]; then echo 'Flake8 linter found no issues'; fi" + - docker compose -f docker-compose.yml exec -T web sh -c "flake8 . && if [ $? -eq 0 ]; then echo 'Flake8 linter found no issues'; fi" backend-pip-lock: #TODO: Add a task to lock the pip dependencies @@ -159,16 +159,16 @@ tasks: dir: tdrs-backend cmds: - task: backend-up - - docker compose -f docker compose.yml exec web sh -c "pipenv lock" + - docker compose -f docker-compose.yml exec web sh -c "pipenv lock" psql: desc: Open a psql shell in the backend container dir: tdrs-backend cmds: - task create-network || true - - docker compose -f docker compose.yml up -d postgres + - docker compose -f docker-compose.yml up -d postgres - sleep 5 - - docker compose -f docker compose.yml exec postgres sh -c "psql -U tdpuser -d tdrs_test" + - docker compose -f docker-compose.yml exec postgres sh -c "psql -U tdpuser -d tdrs_test" clean: desc: Remove all containers, networks, and volumes @@ -182,25 +182,25 @@ tasks: desc: Start clamav service dir: tdrs-backend cmds: - - docker compose -f docker compose.yml up -d clamav-rest + - docker compose -f docker-compose.yml up -d clamav-rest frontend-up: desc: Start frontend web server dir: tdrs-frontend cmds: - - docker compose -f docker compose.yml up -d + - docker compose -f docker-compose.yml up -d frontend-down: desc: Stop frontend web server dir: tdrs-frontend cmds: - - docker compose -f docker compose.yml down + - docker compose -f docker-compose.yml down frontend-restart: desc: Restart frontend web server dir: tdrs-frontend cmds: - - docker compose -f docker compose.yml restart + - docker compose -f docker-compose.yml restart frontend-av: desc: Start frontend with optional clamav service @@ -215,10 +215,10 @@ tasks: desc: Initialize the frontend project dir: tdrs-frontend cmds: - - docker compose -f docker compose.yml up -d --build - - docker compose -f docker compose.yml exec tdp-frontend sh -c "apk add nodejs npm" - - docker compose -f docker compose.yml exec tdp-frontend sh -c "npm install" - - docker compose -f docker compose.yml down + - docker compose -f docker-compose.yml up -d --build + - docker compose -f docker-compose.yml exec tdp-frontend sh -c "apk add nodejs npm" + - docker compose -f docker-compose.yml exec tdp-frontend sh -c "npm install" + - docker compose -f docker-compose.yml down frontend-test: desc: Run frontend tests @@ -258,19 +258,19 @@ tasks: dir: tdrs-frontend cmds: - docker compose -f docker compose.local.yml up -d tdp-frontend-test --quiet-pull - - docker compose -f docker compose.yml exec -T tdp-frontend-test sh -c "npm run lint" + - docker compose -f docker-compose.yml exec -T tdp-frontend-test sh -c "npm run lint" frontend-logs: desc: Show and follow frontend web server logs dir: tdrs-frontend cmds: - - docker compose -f docker compose.yml logs -f + - docker compose -f docker-compose.yml logs -f frontend-bash: desc: Open a shell in the frontend container dir: tdrs-frontend cmds: - - docker compose -f docker compose.yml exec tdp-frontend bash + - docker compose -f docker-compose.yml exec tdp-frontend bash up: desc: Start both frontend and backend web servers