Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Containerfile.download
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ RUN go mod download && go mod verify

COPY . .

# Version information
ARG VERSION=dev
# Version information (OADP_VERSION avoids collision with Konflux-injected VERSION)
ARG OADP_VERSION=dev
ARG GIT_COMMIT=unknown

# Build release binaries for all platforms as direct executables
Expand All @@ -33,7 +33,7 @@ RUN set -e && \
CGO_ENABLED=0 GOOS=$os GOARCH=$arch \
go build -trimpath \
-ldflags="-s -w \
-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${VERSION} \
-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${OADP_VERSION} \
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${GIT_COMMIT} \
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" \
-o /archives/$output \
Expand Down
6 changes: 3 additions & 3 deletions konflux.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
COPY . /workspace
WORKDIR /workspace

# Version information
ARG VERSION=dev
# Version information (OADP_VERSION avoids collision with Konflux-injected VERSION)
ARG OADP_VERSION=dev
ARG GIT_COMMIT=unknown

# Build release binaries for all platforms (CGO_ENABLED=0 for cross-platform
Expand All @@ -27,7 +27,7 @@ RUN set -e && \
CGO_ENABLED=0 GOOS=$os GOARCH=$arch \
go build -trimpath -mod=mod \
-ldflags="-s -w \
-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${VERSION} \
-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${OADP_VERSION} \
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${GIT_COMMIT} \
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" \
-o /archives/$output \
Expand Down
Loading