From 7cf8e4f4414735fabab136827b0bc7a379644d90 Mon Sep 17 00:00:00 2001
From: Olivier Cazade <ocazade@redhat.com>
Date: Mon, 25 Nov 2024 14:32:27 +0000
Subject: [PATCH] Fixing build version during image build

---
 .tekton/pipeline-ref.yaml | 4 +++-
 Dockerfile.downstream     | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.tekton/pipeline-ref.yaml b/.tekton/pipeline-ref.yaml
index c9192212f..17939509e 100644
--- a/.tekton/pipeline-ref.yaml
+++ b/.tekton/pipeline-ref.yaml
@@ -196,7 +196,9 @@ spec:
     - name: BUILD_ARGS
       value:
       - $(params.build-args[*])
-      - "COMMIT=tasks.clone-repository.results.commit"
+      - "COMMIT=$(tasks.clone-repository.results.commit)"
+      - "BUILDVERSION=1.7.1"
+      - "DATE=$(tasks.clone-repository.results.commit-timestamp)"
     - name: BUILD_ARGS_FILE
       value: $(params.build-args-file)
     - name: SOURCE_ARTIFACT
diff --git a/Dockerfile.downstream b/Dockerfile.downstream
index 114915a64..5f892b07e 100644
--- a/Dockerfile.downstream
+++ b/Dockerfile.downstream
@@ -21,7 +21,9 @@ RUN npm run build$BUILDSCRIPT
 
 FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22.5-202407301806.g4c8b32d.el9 as go-builder
 
-ARG LDFLAGS
+ARG BUILDVERSION
+ARG DATE
+
 WORKDIR /opt/app-root
 
 COPY go.mod go.mod
@@ -31,7 +33,7 @@ COPY .mk/ .mk/
 COPY cmd/ cmd/
 COPY pkg/ pkg/
 
-RUN CGO_ENABLED=0 go build -ldflags "$LDFLAGS" -mod vendor -o plugin-backend cmd/plugin-backend.go
+RUN CGO_ENABLED=0 go build -ldflags "-X main.buildVersion=$BUILDVERSION -X main.buildDate=$DATE" -mod vendor -o plugin-backend cmd/plugin-backend.go
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5