Fixing version in downstream builds

netobserv · Nov 25, 2024 · 52bd167 · 52bd167
1 parent e1ab699
commit 52bd167
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.tekton/pipeline-ref.yaml b/.tekton/pipeline-ref.yaml
@@ -197,6 +197,7 @@ spec:
       value:
       - $(params.build-args[*])
       - "COMMIT=tasks.clone-repository.results.commit"
+      - "LDFLAGS=-X main.BuildVersion=1.7.1-$(tasks.clone-repository.results.commit) -X main.BuildDate=$(tasks.clone-repository.results.commit-timestamp)"
     - name: BUILD_ARGS_FILE
       value: $(params.build-args-file)
     - name: SOURCE_ARTIFACT

diff --git a/contrib/docker/Dockerfile.downstream b/contrib/docker/Dockerfile.downstream
@@ -3,6 +3,10 @@ ARG COMMIT
 FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22.5-202407301806.g4c8b32d.el9 as builder
 
 ARG TARGETARCH=amd64
+ARG LDFLAGS
+ARG VERSION
+ARG DATE
+
 WORKDIR /app
 
 # Copy source code
@@ -17,11 +21,13 @@ COPY cmd/ cmd/
 COPY pkg/ pkg/
 
 RUN git status --porcelain
-RUN GOARCH=$TARGETARCH make build_code
+RUN GOARCH=$TARGETARCH go build -ldflags "-X main.BuildVersion=$VERSION -X main.BuildDate=$DATE" "./cmd/flowlogs-pipeline"
 
 # final stage
 FROM --platform=linux/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal:9.5
 
+ARG COMMIT
+
 COPY --from=builder /app/flowlogs-pipeline /app/
 
 # expose ports
@@ -35,5 +41,5 @@ LABEL summary="Network Observability Flow-Logs Pipeline"
 LABEL maintainer="support@redhat.com"
 LABEL io.openshift.tags="network-observability-flowlogs-pipeline"
 LABEL upstream-vcs-type="git"
-LABEL upstream-vcs-type="$COMMIT"
+LABEL upstream-vcs-ref="$COMMIT"
 LABEL description="Flow-Logs Pipeline (a.k.a. FLP) is an observability tool that consumes logs from various inputs, transform them and export logs to loki and / or time series metrics to prometheus."