From 3051116ef80e8db0747ceefbce75902c88d80b8e Mon Sep 17 00:00:00 2001 From: Pavan Navarathna <6504783+pavannd1@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:06:31 -0700 Subject: [PATCH] Update restic to latest version (#2451) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker/tools/Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/docker/tools/Dockerfile b/docker/tools/Dockerfile index 308b052dd1..f89f1001a7 100644 --- a/docker/tools/Dockerfile +++ b/docker/tools/Dockerfile @@ -17,10 +17,7 @@ ENV GITHUB_REPOSITORY=https://github.com/restic/restic WORKDIR /restic -RUN git checkout v0.16.0 -# An older version of module golang.org/x/net is used by restic or it's indirect deps -# manually update go.mod file to use latest version v0.17.0 -RUN echo "replace golang.org/x/net => golang.org/x/net v0.17.0" >> go.mod && go mod tidy +RUN git checkout v0.16.2 RUN go run build.go # Build kopia binary from specific commit @@ -34,10 +31,6 @@ WORKDIR /kopia RUN git checkout ${kopia_build_commit} -# An older version of module golang.org/x/net is used by restic or it's indirect deps -# manually update go.mod file to use latest version v0.17.0 -RUN echo "replace golang.org/x/net => golang.org/x/net v0.17.0" >> go.mod && go mod tidy - RUN GO111MODULE=on GOOS=linux GOARCH=amd64 go build -o kopia \ -ldflags="-X github.com/kopia/kopia/repo.BuildVersion=$(git show --no-patch --format='%cs-%h') \ -X github.com/kopia/kopia/repo.BuildInfo=$(git show --no-patch --format='%cI-%H')-${kopia_build_commit} \