self/pizda-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: self:queues
Branches Tags
self:master self:prod self:dev self:queues
...
compare: self:50d408554ef6b9aefad08700bbe9cdd916741256
Branches Tags
self:prod self:dev self:master self:queues

16 Commits
queues ... 50d408554e

Author SHA1 Message Date
emmatveev
50d408554e Merge pull request 'master' (#20) from master into dev 
Reviewed-on: #20
 2024-11-23 22:38:29 +03:00
emmatveev
443b943bee Merge branch 'master' of https://gitea.sprinthub.ru/self/pizda-bot
All checks were successful
Deploy Dev / Build (pull_request) Successful in 5s
Details
Deploy Dev / Push (pull_request) Successful in 8s
Details
Deploy Dev / Deploy dev (pull_request) Successful in 14s
Details
2024-11-23 22:37:50 +03:00
emmatveev
1d543461e9 fix 2024-11-23 22:36:58 +03:00
emmatveev
37ac151e68 Merge pull request 'fix' (#18) from queues into master
All checks were successful
Deploy Prod / Build (pull_request) Successful in 5s
Details
Deploy Prod / Push (pull_request) Successful in 7s
Details
Deploy Prod / Deploy prod (pull_request) Successful in 13s
Details 
Reviewed-on: #18
 2024-11-22 01:37:44 +03:00
emmatveev
589eb70f69 Merge pull request 'fix' (#17) from queues into dev 
Reviewed-on: #17
 2024-11-22 01:32:48 +03:00
emmatveev
53e929fe5a Merge pull request 'queues' (#16) from queues into master 
Reviewed-on: #16
 2024-11-17 14:13:26 +03:00
emmatveev
5c35987d15 Merge pull request 'fix' (#14) from queues into dev 
Reviewed-on: #14
 2024-11-17 13:15:40 +03:00
emmatveev
09f2a267b2 Merge pull request 'fix' (#13) from queues into dev 
Reviewed-on: #13
 2024-11-17 13:12:16 +03:00
emmatveev
5042df4874 Merge pull request 'fix' (#12) from queues into dev 
Reviewed-on: #12
 2024-11-17 13:09:31 +03:00
emmatveev
7fd853f300 Merge pull request 'fix' (#11) from queues into dev 
Reviewed-on: #11
 2024-11-17 13:06:04 +03:00
emmatveev
6a0471dc15 Merge pull request 'add' (#10) from queues into dev 
Reviewed-on: #10
 2024-11-17 13:01:49 +03:00
emmatveev
cc290465a1 Merge pull request 'queues' (#9) from queues into dev 
Reviewed-on: #9
 2024-11-17 12:58:54 +03:00
emmatveev
1d0abfed03 Merge pull request 'fix' (#6) from master into dev 
Reviewed-on: #6
 2024-10-11 06:50:59 +03:00
emmatveev
e17c5ab7fe Merge pull request 'master' (#5) from master into dev 
Reviewed-on: #5
 2024-10-11 06:49:45 +03:00
emmatveev
ff7f0ffa91 Merge pull request 'fix' (#3) from master into dev 
Reviewed-on: #3
 2024-10-11 06:13:49 +03:00
emmatveev
71a12ef77b Merge pull request 'fix' (#2) from master into dev
All checks were successful
Build and push / Build (push) Successful in 5s
Details
Build and push / Push (push) Successful in 8s
Details 
Reviewed-on: #2
 2024-10-11 05:46:11 +03:00
2 changed files with 8 additions and 8 deletions
Expand all files Collapse all files

12
.deploy/deploy-dev.yaml
View File

@@ -10,7 +10,7 @@ services:
TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
STAGE: "development" STAGE: "development"
networks: networks:
- queues - queues-development
deploy: deploy:
mode: replicated mode: replicated
restart_policy: restart_policy:
@@ -28,7 +28,7 @@ services:
STAGE: "development" STAGE: "development"
PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
networks: networks:
- queues - queues-development
deploy: deploy:
mode: replicated mode: replicated
restart_policy: restart_policy:
@@ -44,7 +44,7 @@ services:
TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
STAGE: "development" STAGE: "development"
networks: networks:
- queues - queues-development
deploy: deploy:
mode: replicated mode: replicated
restart_policy: restart_policy:
@@ -63,7 +63,7 @@ services:
PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
STAGE: "development" STAGE: "development"
networks: networks:
- common-infra-nginx - common-infra-nginx-development
deploy: deploy:
mode: replicated mode: replicated
restart_policy: restart_policy:
@@ -73,7 +73,7 @@ services:
order: start-first order: start-first
networks: networks:
common-infra-nginx: common-infra-nginx-development:
external: true external: true
queues: queues-development:
external: true external: true

4
.gitea/workflows/deploy-dev.yaml
View File

@@ -28,7 +28,7 @@ jobs:
run: docker push mathwave/sprint-repo:pizda-bot run: docker push mathwave/sprint-repo:pizda-bot
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
@@ -42,4 +42,4 @@ jobs:
TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }} TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }}
MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }} MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }} PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot-development