updated docker

build-docker.sh

@@ -19,8 +19,7 @@ echo "Finished swagger build"
 docker image rm $DOCKER_IMAGE_NAME
 
 # build images
-#docker compose build jnx-telegram-bot-manager
+docker build -t $DOCKER_IMAGE_NAME .
-docker build -t $DOCKER_IMAGE_NAME
 
 # tag images
 docker image tag $DOCKER_IMAGE_NAME:latest $DOCKER_REGISTRY_URL/$DOCKER_IMAGE_NAME:latest

docker-compose.yml

@@ -1,9 +0,0 @@
-version: "3"
-
-services:
-  jnx-telegram-bot-manager:
-    container_name: jnx-telegram-bot-manager
-    image: jnx-telegram-bot-manager:latest
-    build:
-      context: .
-      dockerfile: Dockerfile

main.go

@@ -41,6 +41,9 @@ PORT=8080
 
 LOG_MANAGER_SERVER_URL=http://localhost:50110
 
+TELEGRAM_DEBUG=false
+TELEGRAM_TOKEN=your_token
+
 # MariaDB
 MARIADB_HOSTNAME=127.0.0.1
 MARIADB_PORT=3306

modules/config/config.go

@@ -15,9 +15,15 @@ type Config struct {
 	Host                string
 	Port                string
 	LogManagerServerUrl string
+	Telegram            Telegram
 	MariaDB             MariaDB
 }
 
+type Telegram struct {
+	Debug bool
+	Token string
+}
+
 type MariaDB struct {
 	Hostname     string
 	Port         string
@@ -41,6 +47,10 @@ func LoadConfig() {
 		Host:                os.Getenv("HOST"),
 		Port:                os.Getenv("PORT"),
 		LogManagerServerUrl: os.Getenv("LOG_MANAGER_SERVER_URL"),
+		Telegram: Telegram{
+			Debug: os.Getenv("TELEGRAM_DEBUG") == "true",
+			Token: os.Getenv("TELEGRAM_TOKEN"),
+		},
 		MariaDB: MariaDB{
 			Hostname:     os.Getenv("MARIADB_HOSTNAME"),
 			Port:         os.Getenv("MARIADB_PORT"),

modules/telegram/telegram.go

@@ -2,6 +2,7 @@ package telegram
 
 import (
 	"jannex/telegram-bot-manager/modules/cache"
+	"jannex/telegram-bot-manager/modules/config"
 	"jannex/telegram-bot-manager/modules/database"
 	"jannex/telegram-bot-manager/modules/logger"
 	"jannex/telegram-bot-manager/modules/structs"
@@ -20,14 +21,14 @@ var bot *tgbotapi.BotAPI
 func InitBot() {
 	var err error
 
-	bot, err = tgbotapi.NewBotAPI("6450280279:AAGxXdPv_YwRtl_pXIqYojqOecBrEjn3fJo")
+	bot, err = tgbotapi.NewBotAPI(config.Cfg.Telegram.Token)
 
 	if err != nil {
 		logger.AddSystemLog(rslogger.LogTypeError, "Failed to initialize Telegram bot, err: %v", err.Error())
 		log.Fatal().Err(err).Msgf("Failed to initialize Telegram bot, err: %v", err.Error())
 	}
 
-	//bot.Debug = false
+	bot.Debug = config.Cfg.Telegram.Debug
 
 	logger.AddSystemLog(rslogger.LogTypeInfo, "Bot connected as %s", bot.Self.UserName)