From ad0b43cd452c249b6c21dab85f1400571e395eaa Mon Sep 17 00:00:00 2001
From: Paul <itsascambutmailmeanyway@gmail.com>
Date: Thu, 16 Feb 2023 19:52:09 +0100
Subject: [PATCH] Stamp git commit into docker builds. Conditionally include
 git commit into about page.

The if condition is true when the following docker build arg is included

--build-arg=COMMIT=$(git rev-parse --short HEAD)

or when built via github (release.yml)
---
 Dockerfile           | 3 ++-
 README.md            | 8 +++++++-
 main.go              | 1 +
 templates/about.html | 6 ++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a30cefe..e4d5525 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ LABEL maintainer="Khanh Ngo <k@ndk.name"
 
 ARG TARGETOS=linux
 ARG TARGETARCH=amd64
+ARG COMMIT=
 
 ARG BUILD_DEPENDENCIES="npm \
     yarn"
@@ -54,7 +55,7 @@ RUN cp -r /build/custom/ assets/
 
 # Build
 RUN rice embed-go && \
-    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -o wg-ui .
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-X main.gitCommit=${COMMIT}" -a -o wg-ui .
 
 # Release stage
 FROM alpine:3.16
diff --git a/README.md b/README.md
index 489314c..27e2bf1 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,13 @@ feature work.
 Go to the project root directory and run the following command:
 
 ```sh
-docker build -t wireguard-ui .
+docker build --build-arg=COMMIT=$(git rev-parse --short HEAD) -t wireguard-ui .
+```
+
+or
+
+```sh
+docker compose build --build-arg=COMMIT=$(git rev-parse --short HEAD)
 ```
 
 ### Build binary file
diff --git a/main.go b/main.go
index cbfa8b7..8298c6b 100644
--- a/main.go
+++ b/main.go
@@ -116,6 +116,7 @@ func main() {
 	// set app extra data
 	extraData := make(map[string]string)
 	extraData["appVersion"] = appVersion
+	extraData["gitCommit"] = gitCommit
 	extraData["basePath"] = util.BasePath
 
 	// create rice box for embedded template
diff --git a/templates/about.html b/templates/about.html
index 4fc6b77..edbeb47 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -30,6 +30,12 @@ About
                             <label for="version" class="control-label">Current version</label>
                             <input type="text" class="form-control" id="version" value="{{ .appVersion }}" readonly>
                         </div>
+{{ if .gitCommit }}
+                        <div class="form-group">
+                            <label for="version" class="control-label">git commit hash</label>
+                            <input type="text" class="form-control" id="version" value="{{ .gitCommit }}" readonly>
+                        </div>
+{{ end }}
                         <div class="form-group">
                             <label for="currentReleaseDate" class="control-label">Current version release date</label>
                             <input type="text" class="form-control" id="currentReleaseDate" readonly>