master #17

Merged
emmatveev merged 7 commits from master into prod 2024-11-27 02:13:38 +03:00
3 changed files with 4 additions and 9 deletions
Showing only changes of commit be7bc1ef2c - Show all commits

View File

@ -5,7 +5,7 @@ services:
queues: queues:
image: mathwave/sprint-repo:queues image: mathwave/sprint-repo:queues
networks: networks:
- queues - queues-development
environment: environment:
MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_HOST: "mongo.develop.sprinthub.ru"
MONGO_PASSWORD: $MONGO_PASSWORD_DEV MONGO_PASSWORD: $MONGO_PASSWORD_DEV
@ -18,7 +18,5 @@ services:
order: start-first order: start-first
networks: networks:
common-infra-nginx: queues-development:
external: true
queues:
external: true external: true

View File

@ -5,7 +5,6 @@ services:
queues: queues:
image: mathwave/sprint-repo:queues image: mathwave/sprint-repo:queues
networks: networks:
- common-infra-nginx
- queues - queues
environment: environment:
MONGO_HOST: "mongo.sprinthub.ru" MONGO_HOST: "mongo.sprinthub.ru"
@ -19,7 +18,5 @@ services:
order: start-first order: start-first
networks: networks:
common-infra-nginx:
external: true
queues: queues:
external: true external: true

View File

@ -28,7 +28,7 @@ jobs:
run: docker push mathwave/sprint-repo:queues run: docker push mathwave/sprint-repo:queues
deploy-dev: deploy-dev:
name: Deploy dev name: Deploy dev
runs-on: [dev] runs-on: [prod]
needs: push needs: push
steps: steps:
- name: login - name: login
@ -40,4 +40,4 @@ jobs:
- name: deploy - name: deploy
env: env:
MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }} MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml infra run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml infra-development