From 60de6d06874e1bb0be94c81074c8de2dafbc068d Mon Sep 17 00:00:00 2001 From: Shiham Abdul Rahman Date: Tue, 11 Apr 2023 13:18:54 +0500 Subject: [PATCH] tg notifications - more details --- honestyui-build.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/honestyui-build.sh b/honestyui-build.sh index eca60f3..982db42 100755 --- a/honestyui-build.sh +++ b/honestyui-build.sh @@ -4,8 +4,10 @@ source .env echo "Content-type: text/html" echo "" -COMMIT=$(git -C /mnt/vol2/cicd/Fishie-Honesty-UI log -n 1 --abbrev=7 --pretty=format:"%h") -TGTEXT=$(echo Deployment Triggered %0A $(date "+%H:%M:%S %a %b %d %Y") %0A Current Commit id: $(echo $COMMIT) | sed "s/ /%20/g") +COMMIT_ID=$(git -C /mnt/vol2/cicd/Fishie-Honesty-UI log -n 1 --abbrev=7 --pretty=format:"%h") +COMMIT_MSG=$(git -C /mnt/vol2/cicd/Fishie-Honesty-UI log -1 --pretty=format:"%s%n%b") +COMMIT_BY=$(git -C /mnt/vol2/cicd/Fishie-Honesty-UI log -1 --pretty=format:%an) +TGTEXT=$(echo Deployment Triggered %0A $(date "+%H:%M:%S %a %b %d %Y") %0A%0A Current Commit by: $COMMIT_BY %0A ID: $COMMIT_ID %0A Message: $COMMIT_MSG | sed "s/ /%20/g") curl -s $TG_BOTAPI$TG_BOT_TOKEN/sendMessage?chat_id=$HONESTY_TG_CHATID'&'text=$TGTEXT git -C /mnt/vol2/cicd/Fishie-Honesty-UI pull @@ -16,9 +18,10 @@ docker compose -f /mnt/vol3/www/honestyui/docker-compose.yml pull docker compose -f /mnt/vol3/www/honestyui/docker-compose.yml down docker compose -f /mnt/vol3/www/honestyui/docker-compose.yml up -d - -COMMIT=$(git -C /mnt/vol2/cicd/Fishie-Honesty-UI log -n 1 --abbrev=7 --pretty=format:"%h") -TGTEXT=$(echo Deployment Completed %0A $(date "+%H:%M:%S %a %b %d %Y") %0A New Commit id: $(echo $COMMIT) | sed "s/ /%20/g") +COMMIT_ID=$(git -C /mnt/vol2/cicd/Fishie-Honesty-UI log -n 1 --abbrev=7 --pretty=format:"%h") +COMMIT_MSG=$(git -C /mnt/vol2/cicd/Fishie-Honesty-UI log -1 --pretty=format:"%s%n%b") +COMMIT_BY=$(git -C /mnt/vol2/cicd/Fishie-Honesty-UI log -1 --pretty=format:%an) +TGTEXT=$(echo Deployment Completed %0A $(date "+%H:%M:%S %a %b %d %Y") %0A%0A New Commit by: $COMMIT_BY %0A ID: $COMMIT_ID %0A Message: $COMMIT_MSG | sed "s/ /%20/g") curl -s $TG_BOTAPI$TG_BOT_TOKEN/sendMessage?chat_id=$HONESTY_TG_CHATID'&'text=$TGTEXT echo ""