about: show commit id

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

2 files changed, 15 insertions, 1 deletions

diff --git a/pkg/app/handler/about/utils.go b/pkg/app/handler/about/utils.go
index e7d692b..63ca40a 100644
--- a/pkg/app/handler/about/utils.go
+++ b/pkg/app/handler/about/utils.go
@@ -5,6 +5,7 @@ package about
 import (
 	"html/template"
 	"net/http"
+	"runtime/debug"
 	"soko/pkg/app/utils"
 	"soko/pkg/models"
 )
@@ -20,14 +21,27 @@ func renderAboutTemplate(w http.ResponseWriter, r *http.Request, page string) {
 	templates.ExecuteTemplate(w, page+".tmpl", getPageData())
 }
 
+func getCommitId() string {
+	if info, ok := debug.ReadBuildInfo(); ok {
+		for _, setting := range info.Settings {
+			if setting.Key == "vcs.revision" {
+				return setting.Value[:8]
+			}
+		}
+	}
+	return ""
+}
+
 // getPageData returns the data used
 // in all about templates
 func getPageData() interface{} {
 	return struct {
 		Header      models.Header
 		Application models.Application
+		CommitId    string
 	}{
 		Header:      models.Header{Title: "About – ", Tab: "about"},
 		Application: utils.GetApplicationData(),
+		CommitId:    getCommitId(),
 	}
 }
diff --git a/web/templates/about/index.tmpl b/web/templates/about/index.tmpl
index f280b64..af72f4f 100644
--- a/web/templates/about/index.tmpl
+++ b/web/templates/about/index.tmpl
@@ -23,7 +23,7 @@
             <dl>
                 <dt>Which version is currently running?</dt>
                 <dd>
-                    Currently {{.Application.Version}} is running.
+                    Currently {{.Application.Version}} is running{{if ne .CommitId ""}}, based on commit {{.CommitId}}{{end}}.
                 </dd>
                 <br>
                 <dt>How often is the site updated?</dt>