diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index f53da09..53f7193 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -2,22 +2,6 @@ version: "3.4" services: - queues-nginx: - image: mathwave/sprint-repo:queues - networks: - - common-infra-nginx - environment: - MONGO_HOST: "mongo.develop.sprinthub.ru" - MONGO_PASSWORD: $MONGO_PASSWORD_DEV - QUEUES_TOKEN: $QUEUES_TOKEN_DEV - deploy: - mode: replicated - restart_policy: - condition: any - update_config: - parallelism: 1 - order: start-first - queues: image: mathwave/sprint-repo:queues networks: @@ -25,7 +9,6 @@ services: environment: MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_DEV - NEW: "true" deploy: mode: replicated restart_policy: diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index f5d3c0d..5c1962e 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -2,22 +2,6 @@ version: "3.4" services: - queues-nginx: - image: mathwave/sprint-repo:queues - networks: - - common-infra-nginx - environment: - MONGO_HOST: "mongo.sprinthub.ru" - MONGO_PASSWORD: $MONGO_PASSWORD_PROD - QUEUES_TOKEN: $QUEUES_TOKEN_PROD - deploy: - mode: replicated - restart_policy: - condition: any - update_config: - parallelism: 1 - order: start-first - queues: image: mathwave/sprint-repo:queues networks: @@ -26,7 +10,6 @@ services: environment: MONGO_HOST: "mongo.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_PROD - NEW: "true" deploy: mode: replicated restart_policy: diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml index 547e4f0..0150bdf 100644 --- a/.gitea/workflows/deploy-dev.yaml +++ b/.gitea/workflows/deploy-dev.yaml @@ -40,5 +40,4 @@ jobs: - name: deploy env: MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }} - QUEUES_TOKEN_DEV: ${{ secrets.QUEUES_TOKEN_DEV }} run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml infra diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml index 51fd352..9a6c82f 100644 --- a/.gitea/workflows/deploy-prod.yaml +++ b/.gitea/workflows/deploy-prod.yaml @@ -40,5 +40,4 @@ jobs: - name: deploy env: MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }} - QUEUES_TOKEN_PROD: ${{ secrets.QUEUES_TOKEN_PROD }} run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml infra diff --git a/main.py b/main.py index 5fd4b5d..d249cb4 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,5 @@ import fastapi import uvicorn -import os from app.routers import take from app.routers import put @@ -19,6 +18,4 @@ mongo.create_indexes() if __name__ == '__main__': - if os.getenv('NEW') == 'true': - uvicorn.run(app, host="0.0.0.0", port=1239) - uvicorn.run(app, host="0.0.0.0", port=1238) + uvicorn.run(app, host="0.0.0.0", port=1239)