From 498a3f54ddea6a421ccf983955d2eefd38ee61e5 Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Fri, 10 Feb 2023 21:32:28 +0900
Subject: [PATCH] Add GIT_COMMIT Environment variable to container build in
 Jenkins

---
 Jenkinsfile             | 2 ++
 server.py               | 1 +
 templates/settings.html | 1 +
 3 files changed, 4 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index c532111..768d792 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,10 +23,12 @@ pipeline {
                 script {
                     forgejoImage = docker.build("albert/headscale-webui:${env.BRANCH_NAME}-${env.BUILD_ID}",
                         "--label \"GIT_COMMIT=${env.GIT_COMMIT}\""
+                        + "--environment \"GIT_COMMIT=${env.GIT_COMMIT}\""
                         + " ."
                     )
                     ghcrImage = docker.build("ifargle/headscale-webui:${env.BRANCH_NAME}-${env.BUILD_ID}",
                         "--label \"GIT_COMMIT=${env.GIT_COMMIT}\""
+                        + "--environment \"GIT_COMMIT=${env.GIT_COMMIT}\""
                         + " ."
                     )
                 }
diff --git a/server.py b/server.py
index e0fc64b..a8bd7a1 100644
--- a/server.py
+++ b/server.py
@@ -23,6 +23,7 @@ COLOR_NAV   = "blue-grey darken-1"
 COLOR_BTN   = "blue-grey darken-3"
 BASE_PATH   = os.environ["BASE_PATH"]
 APP_VERSION = "0.2.1"
+GIT_COMMIT  = os.environ["GIT_COMMIT"]
 HS_VERSION  = "0.20.0"
 DEBUG_STATE = False
 
diff --git a/templates/settings.html b/templates/settings.html
index 9582ead..d21d7d9 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -34,6 +34,7 @@
           <span class="card-title">About</span>
             <p>Developed with Flask, Python, MaterializeCSS, and jQuery.</p>
             <p>Version: {{ APP_VERSION }}</p>
+            <p>Commit:  {{ GIT_COMMIT }}</p>
             <p>Tested on Headscale {{ HS_VERSION }}</p>
             <p>Repository: <a href="https://github.com/iFargle/headscale-webui">Github</a>.</p>
         </div>