From 7bb330a07a82165d6107ce3446330eb53c1eceee Mon Sep 17 00:00:00 2001
From: Ralph Slooten <axllent@gmail.com>
Date: Mon, 2 Mar 2026 22:38:38 +1300
Subject: [PATCH] Chore: Use last release + git hash in Docker edge versions

---
 .github/workflows/build-docker-edge.yml | 11 +++++++++--
 server/ui-src/components/AppAbout.vue   |  8 ++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-docker-edge.yml b/.github/workflows/build-docker-edge.yml
index d64eda4..7fe7eb2 100644
--- a/.github/workflows/build-docker-edge.yml
+++ b/.github/workflows/build-docker-edge.yml
@@ -9,6 +9,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v6
+      with:
+          fetch-depth: 0 # required for github-action-get-previous-tag
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -29,7 +31,12 @@ jobs:
         username: ${{ github.repository_owner }}
         password: ${{ github.token }}
 
-    - uses: benjlevesque/short-sha@v3.0
+    - name: Get previous git tag
+      uses: WyriHaximus/github-action-get-previous-tag@v2
+      id: previous-tag
+
+    - name: Get short SHA
+      uses: benjlevesque/short-sha@v3.0
       id: short-sha
 
     - name: Build and push
@@ -38,7 +45,7 @@ jobs:
         context: .
         platforms: linux/386,linux/amd64,linux/arm64
         build-args: |
-          "VERSION=edge-${{ steps.short-sha.outputs.sha }}"
+          "VERSION=${{ steps.previous-tag.outputs.tag }}-${{ steps.short-sha.outputs.sha }}"
         push: true
         tags: |
           axllent/mailpit:edge
diff --git a/server/ui-src/components/AppAbout.vue b/server/ui-src/components/AppAbout.vue
index 8a98714..8bd4314 100644
--- a/server/ui-src/components/AppAbout.vue
+++ b/server/ui-src/components/AppAbout.vue
@@ -25,6 +25,13 @@ export default {
 		};
 	},
 
+	computed: {
+		isEdgeBuild() {
+			const re = /^(v\d+.\d+.\d+-)/i;
+			return re.test(mailbox.appInfo.Version);
+		},
+	},
+
 	methods: {
 		loadInfo() {
 			this.get(this.resolve("/api/v1/info"), false, (response) => {
@@ -98,6 +105,7 @@ export default {
 						<h5 id="AppInfoModalLabel" class="modal-title">
 							Mailpit
 							<code>({{ mailbox.appInfo.Version }})</code>
+							<span v-if="isEdgeBuild" class="badge bg-info text-dark ms-2">edge build</span>
 						</h5>
 						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 					</div>