From f5bf9b567be87143f1c9266288ebfc79d7ded0c4 Mon Sep 17 00:00:00 2001 From: Schtil Date: Sat, 1 Mar 2025 08:13:14 +0000 Subject: [PATCH 1/5] add registry mirror --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 611fda9..522ca37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ variables: --destination "${IMAGE_NAME}:${CI_COMMIT_SHA}" --destination "${IMAGE_NAME}:latest" --cache=true + --registry-mirror=https://dockerhub.timeweb.cloud build_frontend: <<: *build-template From e9d231fe77462630ee5393d0471707a9f46e78a7 Mon Sep 17 00:00:00 2001 From: Schtil Date: Sat, 1 Mar 2025 08:25:35 +0000 Subject: [PATCH 2/5] fix registry-mirror --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 522ca37..c4db339 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: --destination "${IMAGE_NAME}:${CI_COMMIT_SHA}" --destination "${IMAGE_NAME}:latest" --cache=true - --registry-mirror=https://dockerhub.timeweb.cloud + --registry-mirror=dockerhub.timeweb.cloud build_frontend: <<: *build-template From daa83dc867117a2fd4631c1da5c3d7c51d75ee7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A1=D1=83=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Sat, 1 Mar 2025 11:26:50 +0300 Subject: [PATCH 3/5] bug: participants field in competition view --- services/backend/api/v1/competition/schemas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backend/api/v1/competition/schemas.py b/services/backend/api/v1/competition/schemas.py index 1c5aff1..079baab 100644 --- a/services/backend/api/v1/competition/schemas.py +++ b/services/backend/api/v1/competition/schemas.py @@ -11,7 +11,7 @@ class CompetitionOut(ModelSchema): class Meta: model = Competition - fields = "__all__" + exclude = ("participants",) class StateOut(ModelSchema): From a02225a22b9185cc74749875472520bacf249f99 Mon Sep 17 00:00:00 2001 From: Schtil Date: Sat, 1 Mar 2025 08:33:34 +0000 Subject: [PATCH 4/5] refactor ci --- .gitlab-ci.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4db339..8292683 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,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 <<'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" From 049c31e3946e1320d30b8a449207d4eab4bfbb63 Mon Sep 17 00:00:00 2001 From: ITQ Date: Sat, 1 Mar 2025 08:40:18 +0000 Subject: [PATCH 5/5] force prune --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8292683..6060120 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,4 +83,4 @@ deploy: 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" + - ssh $SSH_ADDRESS "docker system prune -a --force"