From df5436b38025cb0b0e06a4cceffa3c863307428d Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Tue, 18 Oct 2022 19:38:28 +0800 Subject: [PATCH] upgrade velero docker image Signed-off-by: Lyndon-Li --- golangci.yaml | 12 ++++++------ hack/build-image/Dockerfile | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/golangci.yaml b/golangci.yaml index 0b6da27f7..8c6d87b63 100644 --- a/golangci.yaml +++ b/golangci.yaml @@ -25,8 +25,8 @@ run: # from this option's value (see skip-dirs-use-default). # "/" will be replaced by current OS file path separator to properly work # on Windows. - #skip-dirs: - # - src/external_libs + skip-dirs: + - test/e2e/* # - autogenerated_by_my_lib # default is true. Enables skipping of directories: @@ -39,8 +39,8 @@ run: # autogenerated files. If it's not please let us know. # "/" will be replaced by current OS file path separator to properly work # on Windows. - # skip-files: - # - ".*\\.my\\.go$" + skip-files: + - ".*_test.go$" # - lib/bad.go # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules": @@ -320,7 +320,7 @@ linters: fast: false -#issues: +issues: # # List of regexps of issue texts to exclude, empty list by default. # # But independently from this option we use default exclude patterns, # # it can be disabled by `exclude-use-default: false`. To list all @@ -359,7 +359,7 @@ linters: # it can be disabled by this option. To list all # excluded by default patterns execute `golangci-lint run --help`. # Default value for this option is true. - exclude-use-default: false + exclude-use-default: true # The default value is false. If set to true exclude and exclude-rules # regular expressions become case sensitive. diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 5baa4365e..b3c5e42a0 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.17 +FROM golang:1.18 ARG GOPROXY @@ -36,11 +36,11 @@ RUN wget --quiet https://github.com/kubernetes-sigs/kubebuilder/releases/downloa chmod +x /usr/local/kubebuilder/bin/kubebuilder # get controller-tools -RUN go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0 +RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0 # get goimports (the revision is pinned so we don't indiscriminately update, but the particular commit # is not important) -RUN go get golang.org/x/tools/cmd/goimports@11e9d9cc0042e6bd10337d4d2c3e5d9295508e7d +RUN go install golang.org/x/tools/cmd/goimports@11e9d9cc0042e6bd10337d4d2c3e5d9295508e7d # get protoc compiler and golang plugin WORKDIR /root @@ -49,7 +49,7 @@ RUN wget --quiet https://github.com/protocolbuffers/protobuf/releases/download/v unzip protoc-3.14.0-linux-x86_64.zip && \ mv bin/protoc /usr/bin/protoc && \ chmod +x /usr/bin/protoc -RUN go get github.com/golang/protobuf/protoc-gen-go@v1.4.3 +RUN go install github.com/golang/protobuf/protoc-gen-go@v1.4.3 # get goreleaser RUN wget --quiet https://github.com/goreleaser/goreleaser/releases/download/v0.120.8/goreleaser_Linux_x86_64.tar.gz && \ @@ -58,7 +58,7 @@ RUN wget --quiet https://github.com/goreleaser/goreleaser/releases/download/v0.1 chmod +x /usr/bin/goreleaser # get golangci-lint -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.27.0 +RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.0 # install kubectl RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl