From fa8c6d02fd87f0c3537799f622d12694b7c7aca2 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Mar 2026 23:51:42 +0100 Subject: [PATCH] feat: show build commit on admin page --- Dockerfile | 3 ++- Jenkinsfile | 4 +++- internal/buildinfo/buildinfo.go | 7 +++++++ internal/web/handler.go | 8 +++++--- templates/admin.html | 3 +++ 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 internal/buildinfo/buildinfo.go diff --git a/Dockerfile b/Dockerfile index d4df33c..1c289cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM golang:1.26-alpine AS builder +ARG GIT_COMMIT=dev WORKDIR /app @@ -13,7 +14,7 @@ COPY . . ENV CGO_ENABLED=1 ENV GIN_MODE=release -RUN go build -o app ./cmd/server +RUN go build -ldflags "-X ResendIt/internal/buildinfo.Commit=${GIT_COMMIT}" -o app ./cmd/server FROM alpine:latest diff --git a/Jenkinsfile b/Jenkinsfile index 445d440..8b1a93a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,9 @@ pipeline { sh """ docker version - docker build -t ${IMAGE}:${IMAGE_TAG_SHA} . + docker build \ + --build-arg GIT_COMMIT=${IMAGE_TAG_SHA} \ + -t ${IMAGE}:${IMAGE_TAG_SHA} . """ } } diff --git a/internal/buildinfo/buildinfo.go b/internal/buildinfo/buildinfo.go new file mode 100644 index 0000000..78fb343 --- /dev/null +++ b/internal/buildinfo/buildinfo.go @@ -0,0 +1,7 @@ +package buildinfo + +// Commit is the git commit SHA the binary was built from. +// +// Set at build time via: +// -ldflags "-X ResendIt/internal/buildinfo.Commit=" +var Commit = "dev" diff --git a/internal/web/handler.go b/internal/web/handler.go index 098337f..fff7c52 100644 --- a/internal/web/handler.go +++ b/internal/web/handler.go @@ -1,6 +1,7 @@ package web import ( + "ResendIt/internal/buildinfo" "ResendIt/internal/file" "os" "strconv" @@ -108,9 +109,10 @@ func (h *Handler) AdminPage(c *gin.Context) { totalPages := (totalCount + limit - 1) / limit c.HTML(200, "admin.html", gin.H{ - "Files": adminFiles, - "Page": page, - "TotalPages": totalPages, + "Files": adminFiles, + "Page": page, + "TotalPages": totalPages, + "BuildCommit": buildinfo.Commit, }) } diff --git a/templates/admin.html b/templates/admin.html index 6af4129..2e6f6d3 100644 --- a/templates/admin.html +++ b/templates/admin.html @@ -209,6 +209,9 @@
Data_Density: {{len .Files}} records | Page: {{.Page}}/{{.TotalPages}}
+
+ Build_Commit: {{.BuildCommit}} +