Skip to content

Commit 32c6639

Browse files
Fixing build version during image build (#652)
1 parent 900f210 commit 32c6639

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.tekton/pipeline-ref.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ spec:
196196
- name: BUILD_ARGS
197197
value:
198198
- $(params.build-args[*])
199-
- "COMMIT=tasks.clone-repository.results.commit"
199+
- "COMMIT=$(tasks.clone-repository.results.commit)"
200+
- "BUILDVERSION=1.7.1"
201+
- "DATE=$(tasks.clone-repository.results.commit-timestamp)"
200202
- name: BUILD_ARGS_FILE
201203
value: $(params.build-args-file)
202204
- name: SOURCE_ARTIFACT

Dockerfile.downstream

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ RUN npm run build$BUILDSCRIPT
2121

2222
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22.5-202407301806.g4c8b32d.el9 as go-builder
2323

24-
ARG LDFLAGS
24+
ARG BUILDVERSION
25+
ARG DATE
26+
2527
WORKDIR /opt/app-root
2628

2729
COPY go.mod go.mod
@@ -31,7 +33,7 @@ COPY .mk/ .mk/
3133
COPY cmd/ cmd/
3234
COPY pkg/ pkg/
3335

34-
RUN CGO_ENABLED=0 go build -ldflags "$LDFLAGS" -mod vendor -o plugin-backend cmd/plugin-backend.go
36+
RUN CGO_ENABLED=0 go build -ldflags "-X main.buildVersion=$BUILDVERSION -X main.buildDate=$DATE" -mod vendor -o plugin-backend cmd/plugin-backend.go
3537

3638
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
3739

0 commit comments

Comments
 (0)