diff --git a/Containerfile.download b/Containerfile.download index 6a8f2d95..d504be49 100644 --- a/Containerfile.download +++ b/Containerfile.download @@ -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 @@ -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 \ diff --git a/konflux.Dockerfile b/konflux.Dockerfile index 3d6ff62d..00a3bd3c 100644 --- a/konflux.Dockerfile +++ b/konflux.Dockerfile @@ -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 @@ -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 \