From 6f1b238003df467715f8f16e7a540c1a9f0cebd7 Mon Sep 17 00:00:00 2001 From: Scott Seago Date: Tue, 24 Jan 2023 14:16:20 -0500 Subject: [PATCH] updating version string and restic version for 1.9.5 --- .travis.yml | 2 +- Dockerfile.ubi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32f42ddc47..8d54373ecf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: # Also use -v for downloads/builds to stop no output failures from lxd env buffering. before_script: - go mod vendor -v -- git clone https://github.com/konveyor/restic -b konveyor-0.13.1 +- git clone https://github.com/konveyor/restic -b konveyor-0.14.0 - pushd restic; go mod vendor -v; popd - sed -i 's|-mod=mod|-mod=vendor|g' ${DOCKERFILE1} - sed -i 's|-mod=mod|-mod=vendor|g' ${DOCKERFILE2} diff --git a/Dockerfile.ubi b/Dockerfile.ubi index d5dc84f457..d00f872124 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -3,13 +3,13 @@ FROM quay.io/konveyor/builder:v1.17.2 AS builder ENV GOPATH=$APP_ROOT COPY . /go/src/github.com/vmware-tanzu/velero WORKDIR /go/src/github.com/vmware-tanzu/velero -RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v1.9.1-konveyor' -o /go/src/velero github.com/vmware-tanzu/velero/cmd/velero +RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v1.9.5-konveyor' -o /go/src/velero github.com/vmware-tanzu/velero/cmd/velero FROM quay.io/konveyor/builder:v1.17.2 AS restic-builder ENV GOPATH=$APP_ROOT RUN mkdir -p $APP_ROOT/src/github.com/restic \ && cd $APP_ROOT/src/github.com/restic \ -&& git clone https://github.com/konveyor/restic -b konveyor-dev +&& git clone https://github.com/konveyor/restic -b konveyor-0.14.0 WORKDIR $APP_ROOT/src/github.com/restic/restic RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static"' -o $APP_ROOT/src/restic github.com/restic/restic/cmd/restic