Merge pull request 'master' (#2) from master into dev

Reviewed-on: #2

.deploy/deploy-dev.yaml

@@ -21,7 +21,7 @@ services:
     networks:
       - b-jokes-net
     environment:
-      MONGO_HOST: "mongo.dev.chocomarsh.com"
+      MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
     command: api
     deploy:
@@ -35,7 +35,7 @@ services:
   poll:
     image: mathwave/sprint-repo:b-jokes
     environment:
-      MONGO_HOST: "mongo.dev.chocomarsh.com"
+      MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
     command: poll
     deploy:
@@ -49,9 +49,8 @@ services:
   bot:
     image: mathwave/sprint-repo:b-jokes
     environment:
-      MONGO_HOST: "mongo.dev.chocomarsh.com"
+      MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
-      STAGE: "development"
     command: bot
     networks:
       - configurator

.deploy/deploy-prod.yaml

@@ -21,7 +21,7 @@ services:
     networks:
       - b-jokes-net
     environment:
-      MONGO_HOST: "mongo.chocomarsh.com"
+      MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       DEBUG: "false"
     command: api
@@ -36,7 +36,7 @@ services:
   poll:
     image: mathwave/sprint-repo:b-jokes
     environment:
-      MONGO_HOST: "mongo.chocomarsh.com"
+      MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
       DEBUG: "false"
     command: poll
@@ -48,8 +48,29 @@ services:
         parallelism: 1
         order: start-first
 
+  bot:
+    image: mathwave/sprint-repo:b-jokes
+    environment:
+      MONGO_HOST: "mongo.sprinthub.ru"
+      MONGO_PASSWORD: $MONGO_PASSWORD_PROD
+    command: bot
+    networks:
+      - configurator
+      - queues
+    deploy:
+      mode: replicated
+      restart_policy:
+        condition: any
+      update_config:
+        parallelism: 1
+        order: start-first
+
 networks:
   b-jokes-net:
     driver: overlay
   common-infra-nginx:
     external: true
+  configurator:
+    external: true
+  queues:
+    external: true

.gitea/workflows/deploy-dev.yaml

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

entrypoint.py

@@ -12,7 +12,5 @@ if arg == "poll":
     jokes.poll_jokes()
 elif arg == "api":
     main.run()
-elif arg == "bot":
-    main.bot()
 else:
     raise NotImplementedError("No arg specified!")

main.py

@@ -55,7 +55,6 @@ def bot():
             text = payload.get('text')
             if not text:
                 return
-            text = text.lower()
             for word in configurator.get_config('words'):
                 if word in text:
                     mes = 'Держи шутку!\n' + get_random()