Revert "bot token"

This reverts commit ce8b989f24.

.gitlab-ci.yml

@@ -35,7 +35,6 @@ deploy-dev:
     PORT: 80
     SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
     HOST: "77.246.159.65"
-    BOT_TOKEN: $BOT_TOKEN
 
 deploy-prod:
   extends:

Main/management/commands/bot.py

@@ -1,5 +1,3 @@
-import os
-
 import telebot
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
@@ -7,7 +5,7 @@ from telebot.types import Message
 
 from Main.models import UserInfo
 
-bot = telebot.TeleBot(os.getenv("BOT_TOKEN"))
+bot = telebot.TeleBot("1994460106:AAGrGsCZjF6DVG_T-zycELuVfxnWw8x7UyU")
 
 
 @bot.message_handler(commands=["start"])

docker-compose.yaml

@@ -1,27 +1,17 @@
-version: "3.4"
+version: "3"
 
 
 services:
 
-  .variables:
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
-      POSTGRES_DB: sprint
-      PORT: $PORT
-      HOST: $HOST
-      BOT_TOKEN: $BOT_TOKEN
-      SOLUTIONS_ROOT_EXTERNAL: "${SOLUTIONS_ROOT_EXTERNAL}"
-
   postgres:
     restart: always
-    extends:
-      service: .variables
     build:
       context: .
       dockerfile: dockerfiles/postgres/Dockerfile
     environment:
-
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+      POSTGRES_DB: sprint
     volumes:
       - /sprint-data/postgres-data:/var/lib/postgresql/data
     ports:
@@ -30,8 +20,9 @@ services:
   web:
     image: mathwave/sprint-repo:sprint
     restart: always
-    extends:
+    environment:
-      service: .variables
+      PORT: $PORT
+      HOST: $HOST
     command: scripts/runserver.sh
     ports:
       - "${PORT}:${PORT}"
@@ -44,8 +35,6 @@ services:
     restart: always
     image: mathwave/sprint-repo:sprint
     command: python manage.py storage
-    extends:
-      service: .variables
     ports:
       - "5555:5555"
     volumes:
@@ -54,16 +43,14 @@ services:
   bot:
     image: mathwave/sprint-repo:sprint
     restart: always
-    extends:
+    environment:
-      service: .variables
+      HOST: $HOST
     command: python manage.py bot
     depends_on:
       - web
 
   rabbitmq:
     restart: always
-    extends:
-      service: .variables
     build:
       context: .
       dockerfile: dockerfiles/rabbitmq/Dockerfile
@@ -76,8 +63,9 @@ services:
     image: mathwave/sprint-repo:sprint
     privileged: true
     command: python manage.py receive
-    extends:
+    environment:
-      service: .variables
+      SOLUTIONS_ROOT_EXTERNAL: "${SOLUTIONS_ROOT_EXTERNAL}"
+      HOST: $HOST
     depends_on:
       - web
       - rabbitmq