Skip to content

Commit dbcc8f7

Browse files
Fix arg usage for downstream builds (#558)
1 parent ba3e933 commit dbcc8f7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dockerfile.downstream

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG COMMIT
55
FROM --platform=linux/$TARGETARCH brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23 as builder
66

77
ARG TARGETARCH=amd64
8-
ARG VERSION="unknown"
8+
ARG BUILDVERSION="1.8.0"
99
ARG COMMIT
1010

1111
WORKDIR /opt/app-root
@@ -19,7 +19,7 @@ COPY go.mod go.mod
1919
COPY go.sum go.sum
2020

2121
# Build
22-
RUN GOARCH=$TARGETARCH go build -ldflags "-X 'main.buildVersion=${VERSION}-${COMMIT}' -X 'main.buildDate=`date +%Y-%m-%d\ %H:%M`'" -mod vendor -a -o bin/netobserv-ebpf-agent cmd/netobserv-ebpf-agent.go
22+
RUN GOARCH=$TARGETARCH go build -ldflags "-X 'main.buildVersion=${BUILDVERSION}' -X 'main.buildDate=`date +%Y-%m-%d\ %H:%M`'" -mod vendor -a -o bin/netobserv-ebpf-agent cmd/netobserv-ebpf-agent.go
2323

2424
# Create final image from minimal + built binary
2525
FROM --platform=linux/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal:9.5-1738816775
@@ -38,7 +38,7 @@ LABEL io.k8s.description="Network Observability eBPF Agent"
3838
LABEL summary="Network Observability eBPF Agent"
3939
LABEL maintainer="[email protected]"
4040
LABEL io.openshift.tags="network-observability-ebpf-agent"
41-
LABEL upstream-vcs-ref="$COMMIT"
41+
LABEL upstream-vcs-ref=$COMMIT
4242
LABEL upstream-vcs-type="git"
4343
LABEL description="The Network Observability eBPF Agent allows collecting and aggregating all the ingress and egress flows on a Linux host."
44-
LABEL version="1.8.0"
44+
LABEL version=$BUILDVERSION

0 commit comments

Comments
 (0)