add

2024-10-12 15:36:47 +03:00
parent 2b4bd176ab
commit c6ecaa6c31
4 changed files with 114 additions and 38 deletions
--- a/.deploy-infra/deploy-dev.yaml
+++ b/.deploy-infra/deploy-dev.yaml
@@ -99,24 +99,6 @@ services:
        parallelism: 1
        order: start-first

-  gitlab-runner:
-    image: mathwave/sprint-repo:gitlab-runner
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /sprint-data/gitlab:/etc/gitlab-runner
-      - /sprint-data:/sprint-data
-    environment:
-      GITLAB_REGISTRATION_TOKEN: $GITLAB_REGISTRATION_TOKEN
-    deploy:
-      mode: replicated
-      placement:
-        constraints: [node.role == manager]
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
  minio:
    image: bitnami/minio:2022.10.8
    volumes:
@@ -144,7 +126,7 @@ services:
      - /sprint-data:/sprint-data
    environment:
      GITEA_INSTANCE_URL: https://gitea.sprinthub.ru/
-      GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN_DEV
+      GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN
      GITEA_RUNNER_NAME: dev
      GITEA_RUNNER_LABELS: dev
    deploy:
--- a/.deploy-infra/deploy-prod.yaml
+++ b/.deploy-infra/deploy-prod.yaml
@@ -104,24 +104,6 @@ services:
        parallelism: 1
        order: start-first

-  gitlab-runner:
-    image: mathwave/sprint-repo:gitlab-runner
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /sprint-data/gitlab:/etc/gitlab-runner
-      - /sprint-data:/sprint-data
-    environment:
-      GITLAB_REGISTRATION_TOKEN: $GITLAB_REGISTRATION_TOKEN
-    deploy:
-      mode: replicated
-      placement:
-        constraints: [node.role == manager]
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
  minio:
    image: bitnami/minio:2022.10.8
    volumes:
@@ -176,7 +158,7 @@ services:
      - /sprint-data:/sprint-data
    environment:
      GITEA_INSTANCE_URL: https://gitea.sprinthub.ru/
-      GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN_PROD
+      GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN
      GITEA_RUNNER_NAME: prod
      GITEA_RUNNER_LABELS: prod
    deploy: