From 4d1cf2bf28d2bacf90f10f133ded6cfb23f64438 Mon Sep 17 00:00:00 2001
From: NovaFox161 <novamaday@gmail.com>
Date: Sun, 8 Oct 2023 18:28:45 -0500
Subject: [PATCH] Add build version info to image tags

Storage is cheap, and these images are layered correctly, so I think its
worth it for even better reproducibility
---
 cam/build.gradle.kts    | 8 +++++++-
 client/build.gradle.kts | 8 +++++++-
 core/build.gradle.kts   | 4 ++--
 server/build.gradle.kts | 8 +++++++-
 web/build.gradle.kts    | 8 +++++++-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/cam/build.gradle.kts b/cam/build.gradle.kts
index 33de04b4c..ef96508e7 100644
--- a/cam/build.gradle.kts
+++ b/cam/build.gradle.kts
@@ -26,8 +26,14 @@ kotlin {
 
 jib {
     to {
+        val buildVersion = if (System.getenv("GITHUB_RUN_NUMBER") != null) {
+            "$version.b${System.getenv("GITHUB_RUN_NUMBER")}"
+        } else {
+            "$version.d${System.currentTimeMillis().div(1000)}" //Seconds since epoch
+        }
+
         image = "rg.nl-ams.scw.cloud/dreamexposure/discal-cam"
-        tags = mutableSetOf("latest", version.toString())
+        tags = mutableSetOf("latest", version.toString(), buildVersion)
     }
 
     val baseImage: String by properties
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
index 1644f5025..c12a3bdd3 100644
--- a/client/build.gradle.kts
+++ b/client/build.gradle.kts
@@ -25,8 +25,14 @@ kotlin {
 
 jib {
     to {
+        val buildVersion = if (System.getenv("GITHUB_RUN_NUMBER") != null) {
+            "$version.b${System.getenv("GITHUB_RUN_NUMBER")}"
+        } else {
+            "$version.d${System.currentTimeMillis().div(1000)}" //Seconds since epoch
+        }
+
         image = "rg.nl-ams.scw.cloud/dreamexposure/discal-client"
-        tags = mutableSetOf("latest", version.toString())
+        tags = mutableSetOf("latest", version.toString(), buildVersion)
     }
 
     val baseImage: String by properties
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 579effa71..7dc2f24cf 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -33,14 +33,14 @@ kotlin {
 gitProperties {
     extProperty = "gitPropertiesExt"
 
-    val versionName = if (System.getenv("GITHUB_RUN_NUMBER") != null) {
+    val buildVersion = if (System.getenv("GITHUB_RUN_NUMBER") != null) {
         "$version.b${System.getenv("GITHUB_RUN_NUMBER")}"
     } else {
         "$version.d${System.currentTimeMillis().div(1000)}" //Seconds since epoch
     }
 
     // Custom git properties for compile-time constants
-    customProperty("discal.version", versionName)
+    customProperty("discal.version", buildVersion)
     customProperty("discal.version.d4j", discord4jVersion)
 }
 
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index f8920fcc0..2417960e0 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -29,8 +29,14 @@ kotlin {
 
 jib {
     to {
+        val buildVersion = if (System.getenv("GITHUB_RUN_NUMBER") != null) {
+            "$version.b${System.getenv("GITHUB_RUN_NUMBER")}"
+        } else {
+            "$version.d${System.currentTimeMillis().div(1000)}" //Seconds since epoch
+        }
+
         image = "rg.nl-ams.scw.cloud/dreamexposure/discal-server"
-        tags = mutableSetOf("latest", version.toString())
+        tags = mutableSetOf("latest", version.toString(), buildVersion)
     }
 
     val baseImage: String by properties
diff --git a/web/build.gradle.kts b/web/build.gradle.kts
index 7d7dec797..c9fea34e1 100644
--- a/web/build.gradle.kts
+++ b/web/build.gradle.kts
@@ -39,8 +39,14 @@ sourceSets {
 
 jib {
     to {
+        val buildVersion = if (System.getenv("GITHUB_RUN_NUMBER") != null) {
+            "$version.b${System.getenv("GITHUB_RUN_NUMBER")}"
+        } else {
+            "$version.d${System.currentTimeMillis().div(1000)}" //Seconds since epoch
+        }
+
         image = "rg.nl-ams.scw.cloud/dreamexposure/discal-web"
-        tags = mutableSetOf("latest", version.toString())
+        tags = mutableSetOf("latest", version.toString(), buildVersion)
     }
 
     val baseImage: String by properties