From eadc1be6d39a9df5cc180b96ac74d5a5e6f79c45 Mon Sep 17 00:00:00 2001 From: emmatveev Date: Wed, 27 Nov 2024 18:41:24 +0300 Subject: [PATCH] fix --- .deploy/deploy-dev.yaml | 2 -- .deploy/deploy-prod.yaml | 36 ------------------------------- .gitea/workflows/deploy-dev.yaml | 2 -- .gitea/workflows/deploy-prod.yaml | 2 -- 4 files changed, 42 deletions(-) diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index 2dc9fd8..01179c7 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -24,10 +24,8 @@ services: image: mathwave/sprint-repo:pizda-bot command: api environment: - TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_DEV - PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN STAGE: "development" networks: - common-infra-nginx-development diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index f11e53a..e8432f1 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -2,23 +2,6 @@ version: "3.4" services: - - poll: - image: mathwave/sprint-repo:pizda-bot - command: poll - environment: - TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD - STAGE: "production" - networks: - - queues - deploy: - mode: replicated - restart_policy: - condition: any - update_config: - parallelism: 1 - order: start-first - worker: image: mathwave/sprint-repo:pizda-bot command: worker @@ -38,31 +21,12 @@ services: parallelism: 1 order: start-first - mailbox: - image: mathwave/sprint-repo:pizda-bot - command: mailbox - environment: - TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD - STAGE: "production" - networks: - - queues - deploy: - mode: replicated - restart_policy: - condition: any - update_config: - parallelism: 1 - order: start-first - pizda-bot-nginx: image: mathwave/sprint-repo:pizda-bot command: api environment: - TELEGRAM_TOKEN: $TELEGRAM_TOKEN_PROD MONGO_HOST: "mongo.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_PROD - PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN - STAGE: "production" networks: - common-infra-nginx deploy: diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml index 2c6b44e..9515a0c 100644 --- a/.gitea/workflows/deploy-dev.yaml +++ b/.gitea/workflows/deploy-dev.yaml @@ -39,7 +39,5 @@ jobs: ref: dev - name: deploy env: - TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }} MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }} - PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }} run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot-development diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml index 2dbefe7..cd6e772 100644 --- a/.gitea/workflows/deploy-prod.yaml +++ b/.gitea/workflows/deploy-prod.yaml @@ -39,7 +39,5 @@ jobs: ref: prod - name: deploy env: - TELEGRAM_TOKEN_PROD: ${{ secrets.TELEGRAM_TOKEN_PROD }} MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }} - PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }} run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml pizda-bot