From 225e21edb7978db6e16438f9f4c564c778f66ddd Mon Sep 17 00:00:00 2001
From: Casper <casperklein@users.noreply.github.com>
Date: Mon, 17 May 2021 14:54:43 +0200
Subject: [PATCH] Add version variable (#1976)

---
 Dockerfile                         | 8 +++++++-
 target/scripts/start-mailserver.sh | 7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bc11d6b7..7ffbbf76 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -162,7 +162,13 @@ RUN \
   touch /var/log/auth.log && \
   update-locale && \
   rm /etc/postsrsd.secret && \
-  rm /etc/cron.daily/00logwatch
+  rm /etc/cron.daily/00logwatch && \
+  if [[ ${VCS_VER} =~ ^refs/tags/v.+ ]]; then \
+    echo "export DMS_VERSION='${VCS_VER:11}'" >>/root/.bashrc; \
+  else \
+    echo "export DMS_VERSION='${VCS_REF}'" >>/root/.bashrc; \
+  fi
+
 
 # –––––––––––––––––––––––––––––––––––––––––––––––
 # ––– PostSRSD, Postgrey & Amavis –––––––––––––––
diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh
index 33760268..1a155507 100755
--- a/target/scripts/start-mailserver.sh
+++ b/target/scripts/start-mailserver.sh
@@ -249,13 +249,16 @@ function _defunc
 # shellcheck source=./startup/daemons-stack.sh
 . /usr/local/bin/daemons-stack.sh
 
+# source DMS_VERSION variable
+. /root/.bashrc
+
 # ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––
 # ? << Sourcing all stacks
 # ––
 # ? >> Executing all stacks
 # ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––
 
-_notify 'inf' 'Welcome to docker-mailserver'
+_notify 'tasklog' "Welcome to docker-mailserver ${DMS_VERSION}"
 _notify 'inf' 'ENVIRONMENT'
 [[ ${DMS_DEBUG} -eq 1 ]] && printenv
 
@@ -269,6 +272,6 @@ start_daemons
 _notify 'tasklog' "${HOSTNAME} is up and running"
 
 touch /var/log/mail/mail.log
-tail -fn 0 /var/log/mail/mail.log
+tail -Fn 0 /var/log/mail/mail.log
 
 exit 0