Merge remote-tracking branch 'origin/master'

This commit is contained in:
Timur
2025-03-01 12:09:31 +03:00
2 changed files with 11 additions and 7 deletions
+10 -6
View File
@@ -24,6 +24,7 @@ variables:
--destination "${IMAGE_NAME}:${CI_COMMIT_SHA}"
--destination "${IMAGE_NAME}:latest"
--cache=true
--registry-mirror=dockerhub.timeweb.cloud
build_frontend:
<<: *build-template
@@ -74,9 +75,12 @@ deploy:
- ssh $SSH_ADDRESS "$AUTH_COMMAND"
- scp -C -r infrastructure/ compose.yaml $SSH_ADDRESS:~/deploy/
- ssh $SSH_ADDRESS "docker -v"
- ssh $SSH_ADDRESS "cd ~/deploy && \
docker compose pull > deploy.log 2>&1 && \
docker compose down >> deploy.log 2>&1 && \
docker compose up -d --remove-orphans >> deploy.log 2>&1 && \
docker compose ps >> deploy.log 2>&1"
- ssh $SSH_ADDRESS "docker system prune -a"
- |
ssh $SSH_ADDRESS <<'EOF'
cd ~/deploy
docker compose pull > deploy.log 2>&1
docker compose down >> deploy.log 2>&1
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"
@@ -11,7 +11,7 @@ class CompetitionOut(ModelSchema):
class Meta:
model = Competition
fields = "__all__"
exclude = ("participants",)
class StateOut(ModelSchema):