From 1bdf5efb74c8f3f27063c3651999281f17cc2c41 Mon Sep 17 00:00:00 2001 From: Ruberoid Date: Fri, 18 Jul 2025 17:23:48 +0300 Subject: [PATCH] fixed all configs, --- .env.template | 15 --------------- README.md | 2 +- docker-compose.yml | 47 ++++++++++++++++++++-------------------------- telegram-client | 2 +- telegram-listener | 2 +- text-matcher | 2 +- users | 2 +- 7 files changed, 25 insertions(+), 47 deletions(-) delete mode 100644 .env.template diff --git a/.env.template b/.env.template deleted file mode 100644 index 136d8ab..0000000 --- a/.env.template +++ /dev/null @@ -1,15 +0,0 @@ -### ./docker-compose.yml env variables config. - -## telegram-listener -# telegram account details https://my.telegram.org -WTelegramClientOptions__ApiHash = -WTelegramClientOptions__ApiId = -WTelegramClientOptions__PhoneNumber = - -## telegarm-client -# telegram bot token details @BotFather -TelegramBotOptions__Token = -# toggle admin notificatons and upper bot accessed public channels ids (usually starts with "-100" -AdministrationOptions__EnableUpdateTelegramLogging = -AdministrationOptions__FeedbackReceiverIds__0 = -AdministrationOptions__UpdateReceiverIds__0 = diff --git a/README.md b/README.md index b35a521..7340cf8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ --- -docker-compose.yml файл используется для старта проектов и зависисмостей внутри докера. Конфигурация хостовых сервисов опирается на конфигурационный файл общего назначения appsettings.DockerCompose.json. Однако чувствительные для секретов переменные хранятся в `.env` файле, для чего представлен шаблон `.env.template`. +docker-compose.yml файл используется для старта проектов и зависисмостей внутри докера. Конфигурация хостовых сервисов опирается на конфигурационный файл общего назначения `appsettings.json` и специфичный для докера `appsettings.DockerCompose.json` (частный файл). Однако общие чувствительные для всех видов запуска секреты хранятся в `appsettings.protected.json`. Для личного пользования и отдельного запуска проектов необходимо двигаться по пути `appsettings.Development.json`. Статус сборки drone: diff --git a/docker-compose.yml b/docker-compose.yml index 29440c2..2976c7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,19 +9,32 @@ services: - 4999:8080 environment: ASPNETCORE_ENVIRONMENT: DockerCompose - TelegramBotOptions__Token: ${TelegramBotOptions__Token} - AdministrationOptions__FeedbackReceiverIds__0: ${AdministrationOptions__FeedbackReceiverIds__0} - AdministrationOptions__UpdateReceiverIds__0: ${AdministrationOptions__UpdateReceiverIds__0} - AdministrationOptions__EnableUpdateTelegramLogging: ${AdministrationOptions__EnableUpdateTelegramLogging} depends_on: nocr-rabbitmq: condition: service_healthy + #nocr-telegram-listener: + # condition: service_healthy #nocr-users: # condition: service_healthy #nocr-text-matcher: - # condition: service_healthy - #nocr-telegram-listener: - # condition: service_healthy + # condition: service_healthy + + nocr-telegram-listener: + container_name: nocr-telegram-listener + image: nocr-telegram-listener:latest + build: + context: telegram-listener + dockerfile: src/Nocr.TelegramListener.Host/Dockerfile + ports: + - 5000:8080 + environment: + ASPNETCORE_ENVIRONMENT: DockerCompose + session_pathname: '/app/WTelegram.session' + volumes: + - ./WTelegram.session:/app/WTelegram.session + depends_on: + nocr-rabbitmq: + condition: service_healthy nocr-text-matcher: container_name: nocr-text-matcher @@ -53,26 +66,6 @@ services: nocr-text-matcher-db: condition: service_healthy - nocr-telegram-listener: - container_name: nocr-telegram-listener - image: nocr-telegram-listener:latest - build: - context: telegram-listener - dockerfile: src/Nocr.TelegramListener.Host/Dockerfile - ports: - - 5000:8080 - environment: - ASPNETCORE_ENVIRONMENT: DockerCompose - session_pathname: '/app/WTelegram.session' - WTelegramClientOptions__ApiHash: ${WTelegramClientOptions__ApiHash} - WTelegramClientOptions__ApiId: ${WTelegramClientOptions__ApiId} - WTelegramClientOptions__PhoneNumber: ${WTelegramClientOptions__PhoneNumber} - volumes: - - ./WTelegram.session:/app/WTelegram.session - depends_on: - nocr-rabbitmq: - condition: service_healthy - nocr-users: container_name: nocr-users image: nocr-users:latest diff --git a/telegram-client b/telegram-client index f25f342..ea27d8d 160000 --- a/telegram-client +++ b/telegram-client @@ -1 +1 @@ -Subproject commit f25f3429cb94fb93924ffd0b26250fff68aadcb9 +Subproject commit ea27d8d448f44b5a1767419c0b2c3371684c0d45 diff --git a/telegram-listener b/telegram-listener index 269826b..6c74bdb 160000 --- a/telegram-listener +++ b/telegram-listener @@ -1 +1 @@ -Subproject commit 269826b70fdf8d1b09402eab40af60074ac74f0a +Subproject commit 6c74bdbefc5fadec9ce203882bda2001a96c786f diff --git a/text-matcher b/text-matcher index 1dddca8..ebbec35 160000 --- a/text-matcher +++ b/text-matcher @@ -1 +1 @@ -Subproject commit 1dddca85ba7e5cd4cc41e6b3c4dc72ee2e3154d0 +Subproject commit ebbec35e62ff45d3f3f7c7420ffafe36bccedde2 diff --git a/users b/users index b7736a1..fc2e511 160000 --- a/users +++ b/users @@ -1 +1 @@ -Subproject commit b7736a189127adf7ff153e2fecc54fe4cbe6b90a +Subproject commit fc2e511985a205fd9b4883c06311b76bb92dcfe8