From 84658b825bc615b25feb8b3fefd4524982477e32 Mon Sep 17 00:00:00 2001
From: Mifarse <serafim.urukov@gmail.com>
Date: Sun, 31 Oct 2021 17:49:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=B1?=
 =?UTF-8?q?=D1=83=D0=B4=D1=83=D1=82=20=D0=B2=20=D1=81=D0=BE=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml     | 3 ++-
 TelegramBot/bot.py               | 5 +++--
 TelegramBot/messages/messages.py | 4 ++--
 docker-compose.yml               | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c1de0af..50f86c8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,7 +25,8 @@ jobs:
           '
           cd Carolyn &&
           git pull &&
-          export CAROLYN_DEPLOY_INFO="$(git rev-parse HEAD)" &&
+          export CAROLYN_DEPLOY_ID="$(git rev-parse HEAD)" &&
+          export CAROLYN_DEPLOY_VERSION="$(git describe --tags)" &&
           docker-compose down &&
           docker-compose up -d
           '
diff --git a/TelegramBot/bot.py b/TelegramBot/bot.py
index e8f1370..b51d68b 100644
--- a/TelegramBot/bot.py
+++ b/TelegramBot/bot.py
@@ -397,8 +397,9 @@ def variant(update: Update, context: CallbackContext):
 
 def about(update: Update, context: CallbackContext):
     """Получить инфу о развертывании бота."""
-    deploy_info = os.environ.get("CAROLYN_DEPLOY_INFO", "")
-    update.message.reply_html(MESSAGES.Deploy.about(deploy_info))
+    commit_id = os.environ.get("CAROLYN_DEPLOY_ID", "")
+    verison = os.environ.get("CAROLYN_DEPLOY_VERSION", "")
+    update.message.reply_html(MESSAGES.Deploy.about(commit_id, verison))
 
 
 def error(update: Update, context: CallbackContext):
diff --git a/TelegramBot/messages/messages.py b/TelegramBot/messages/messages.py
index 0d369a9..baab794 100644
--- a/TelegramBot/messages/messages.py
+++ b/TelegramBot/messages/messages.py
@@ -113,8 +113,8 @@ class Messages:
 
     class Deploy:
         @staticmethod
-        def about(commit_id: str):
-            return f"ℹ️ Информация о сборке:\n<a href='https://github.com/Faridik/Carolyn/commit/{commit_id}'>{commit_id:7}</a>"
+        def about(commit_id: str, git_describe):
+            return f"ℹ️ Версия сборки:\n<a href='https://github.com/Faridik/Carolyn/commit/{commit_id}'>{git_describe}</a>"
 
     class Spreadsheets:
         pass
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e1e0ae..cb5a00d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,8 @@ services:
   telegrambot:
     container_name: "carolyn-telegrambot"
     environment:
-      - CAROLYN_DEPLOY_INFO
+      - CAROLYN_DEPLOY_ID
+      - CAROLYN_DEPLOY_VERSION
     restart: always
     build: ./TelegramBot
     volumes: