embed version and commit at build time

Author: joshspicer

.devcontainer/devcontainer.json

@@ -7,5 +7,11 @@
 		"ghcr.io/devcontainers/features/github-cli:1": {},
 		"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}
 	},
-	"customizations": {}
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"github.vscode-github-actions",
+			]
+		}
+	}
 }

.github/workflows/deploy-to-cluster.yaml

@@ -27,11 +27,11 @@
 
 name: Build and deploy jarvis to AKS
 
-on:
+# on:
   # push:
   #   branches:
   #     - main
-  workflow_dispatch:
+  # workflow_dispatch:
 
 env:
   AZURE_CONTAINER_REGISTRY: ${{ secrets.AZURE_CONTAINER_REGISTRY }}

.github/workflows/push-artifacts.yml

@@ -37,6 +37,7 @@ jobs:
         goos: ${{ matrix.goos }}
         goarch: ${{ matrix.goarch }}
         goversion: "1.18"
+        ldflags: "-X 'main.commit=${{ github.sha }}' -X 'main.version=${{ needs.create-release.outputs.tag_name }}'"
         md5sum: FALSE
         sha256sum: TRUE
         project_path: "./server"
@@ -46,13 +47,14 @@ jobs:
 
   push-docker-image:
     runs-on: ubuntu-latest
+    needs: [create-release]
     permissions:
       packages: write
       contents: read
     steps:
     - uses: actions/checkout@v3
     - name: Build the Docker image
-      run: docker build -f ./Dockerfile ./server --tag jarvis:latest
+      run: docker build -f ./Dockerfile ./server --tag jarvis:latest --build-arg JARVIS_BUILD_COMMIT=${{ github.sha }} --build-arg JARVIS_BUILD_VERSION=${{ needs.create-release.outputs.tag_name }}
     - name: Log in to registry
       run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u USERNAME --password-stdin
     - name: Push image

Dockerfile

@@ -1,12 +1,18 @@
+
 FROM golang:1.18
 
+ARG JARVIS_BUILD_COMMIT="0000"
+ARG JARVIS_BUILD_VERSION="dev"
+
 WORKDIR /usr/src/app
 
 # pre-copy/cache go.mod for pre-downloading dependencies and only redownloading them in subsequent builds if they change
 COPY go.mod go.sum ./
 RUN go mod download && go mod verify
 
 COPY . .
-RUN go build -v -o /usr/local/bin/app ./...
+RUN go build \ 
+    --ldflags "-X 'main.commit=$JARVIS_BUILD_COMMIT' -X 'main.version=$JARVIS_BUILD_VERSION'" \
+     -v -o /usr/local/bin/app ./...
 
 CMD ["app"]

rollout.yaml

@@ -16,7 +16,7 @@ spec:
         "kubernetes.io/os": linux
       containers:
       - name: jarvis
-        image: jarvisdevacr.azurecr.io/jarvis:1.0.0
+        image: ghcr.io/joshspicer/jarvis:latest
         resources:
           requests:
             cpu: 100m

server/clusterRouter.go

@@ -26,7 +26,12 @@ func ClusterRouter(bot *tgbotapi.BotAPI) *gin.Engine {
 }
 
 func health(c *gin.Context) {
-	c.String(http.StatusOK, "healthy")
+	// Set no cache headers
+	c.Header("Cache-Control", "no-cache, no-store, no-transform, must-revalidate, private, max-age=0")
+	c.Header("Pragma", "no-cache")
+	c.Header("Expires", "0")
+	c.Header("X-Accel-Expires", "0")
+	c.String(http.StatusOK, fmt.Sprintf("healthy\n%s\n%s", version, commit))
 }
 
 func trustedKnock(c *gin.Context) {

server/main.go

@@ -10,7 +10,14 @@ import (
 	"github.com/joho/godotenv"
 )
 
+var (
+	version = "dev"
+	commit  = "0000"
+)
+
 func main() {
+	fmt.Printf("[jarvis] %s, %s\n", version, commit)
+
 	// Get first argument to determine mode
 	mode := determineMode()
 
@@ -29,13 +36,13 @@ func main() {
 		log.Printf("Starting cluster")
 		bot := SetupTelegram()
 		initializeCluster(bot, mode)
-	case "router":
-		log.Printf("Starting router")
-		bot := SetupTelegram()
-		initializeRouter(bot, mode)
-	case "node":
-		log.Printf("Starting node")
-		initializeNode(mode)
+	// case "home":
+	// 	log.Printf("Starting home")
+	// 	bot := SetupTelegram()
+	// 	initializeHome(bot, mode)
+	// case "node":
+	// 	log.Printf("Starting node")
+	// 	initializeNode(mode)
 	default:
 		log.Fatalf("Invalid mode: %s", mode)
 	}
@@ -54,23 +61,23 @@ func initializeCluster(bot *tgbotapi.BotAPI, mode string) {
 	router.Run(fmt.Sprintf(":%s", PORT))
 }
 
-func initializeRouter(bot *tgbotapi.BotAPI, mode string) {
-	botExtended := &BotExtended{bot}
-	botExtended.SendMessageToPrimaryTelegramGroup("[narnia initializing]")
-	SetupTelegramCommandHandler(botExtended, mode)
-}
+// func initializeHome(bot *tgbotapi.BotAPI, mode string) {
+// 	botExtended := &BotExtended{bot}
+// 	botExtended.SendMessageToPrimaryTelegramGroup("[narnia initializing]")
+// 	SetupTelegramCommandHandler(botExtended, mode)
+// }
 
-func initializeNode(mode string) {
-	router := NodeRouter()
+// func initializeNode(mode string) {
+// 	router := NodeRouter()
 
-	PORT := os.Getenv("PORT")
-	if PORT == "" {
-		PORT = "4000"
-	}
-	log.Printf("Serving at http://localhost:%s", PORT)
-	router.Run(fmt.Sprintf(":%s", PORT))
+// 	PORT := os.Getenv("PORT")
+// 	if PORT == "" {
+// 		PORT = "4000"
+// 	}
+// 	log.Printf("Serving at http://localhost:%s", PORT)
+// 	router.Run(fmt.Sprintf(":%s", PORT))
 
-}
+// }
 
 func determineMode() string {
 	DEFAULT_MODE := "cluster"