From a86bbbf9a30727087de7bd26c59d6285d12e1c40 Mon Sep 17 00:00:00 2001 From: Dan Ramich Date: Wed, 12 Jun 2019 11:20:02 -0700 Subject: [PATCH] Use release branch for goimports --- Dockerfile.dapper | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 31ef481d..c0f9692d 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -5,8 +5,9 @@ RUN go get -d golang.org/x/lint/golint && \ git -C /go/src/golang.org/x/lint/golint checkout -b current 06c8688daad7faa9da5a0c2f163a3d14aac986ca && \ go install golang.org/x/lint/golint && \ rm -rf /go/src /go/pkg +# This install needs to be kept up to date with rancher/rancher RUN go get -d golang.org/x/tools/cmd/goimports && \ - git -C /go/src/golang.org/x/tools/cmd/goimports checkout -b current 26e35f15edef9a960ed13c88b445c5674371da18 && \ + git -C /go/src/golang.org/x/tools/cmd/goimports checkout -b release-branch.go1.12 origin/release-branch.go1.12 && \ go install golang.org/x/tools/cmd/goimports && \ rm -rf /go/src /go/pkg