PROD.2025/DataRush
1
0
Fork 0
mirror of https://gitlab.com/megazordpobeda/DataRush.git synced 2026-05-23 03:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Timur
2025-03-01 12:09:31 +03:00
parent 61b6a29417 049c31e394
commit f2c0578d5e
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+10 -6
View File
@@ -24,6 +24,7 @@ variables:
--destination "${IMAGE_NAME}:${CI_COMMIT_SHA}" --destination "${IMAGE_NAME}:${CI_COMMIT_SHA}"
--destination "${IMAGE_NAME}:latest" --destination "${IMAGE_NAME}:latest"
--cache=true --cache=true
--registry-mirror=dockerhub.timeweb.cloud
build_frontend: build_frontend:
<<: *build-template <<: *build-template
@@ -74,9 +75,12 @@ deploy:
- ssh $SSH_ADDRESS "$AUTH_COMMAND" - ssh $SSH_ADDRESS "$AUTH_COMMAND"
- scp -C -r infrastructure/ compose.yaml $SSH_ADDRESS:~/deploy/ - scp -C -r infrastructure/ compose.yaml $SSH_ADDRESS:~/deploy/
- ssh $SSH_ADDRESS "docker -v" - ssh $SSH_ADDRESS "docker -v"
- ssh $SSH_ADDRESS "cd ~/deploy && \ - |
docker compose pull > deploy.log 2>&1 && \ ssh $SSH_ADDRESS <<'EOF'
docker compose down >> deploy.log 2>&1 && \ cd ~/deploy
docker compose up -d --remove-orphans >> deploy.log 2>&1 && \ docker compose pull > deploy.log 2>&1
docker compose ps >> deploy.log 2>&1" docker compose down >> deploy.log 2>&1
- ssh $SSH_ADDRESS "docker system prune -a" docker compose up -d --remove-orphans >> deploy.log 2>&1
docker compose ps >> deploy.log 2>&1
EOF
- ssh $SSH_ADDRESS "docker system prune -a --force"
services/backend/api/v1/competition/schemas.py
+1 -1
View File
@@ -11,7 +11,7 @@ class CompetitionOut(ModelSchema):
class Meta: class Meta:
model = Competition model = Competition
fields = "__all__" exclude = ("participants",)
class StateOut(ModelSchema): class StateOut(ModelSchema):