Change golangci-lint version to the latest and Fix docker build error (…

…#1435) * change golangci-lint version to the latest(1.42.1) Signed-off-by: hlts2 <[email protected]> * change ubuntu version Signed-off-by: hlts2 <[email protected]> * change ubuntu version of agent dockerfile Signed-off-by: hlts2 <[email protected]> * fix ngt image actions workflow to be able to hook changes in dockerfile Signed-off-by: hlts2 <[email protected]> Co-authored-by: Kevin Diu <[email protected]>
vdaas · Sep 8, 2021 · 8b7ab51 · 8b7ab51
1 parent 72a25a7
commit 8b7ab51
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml
@@ -51,6 +51,7 @@ on:
       - "apis/grpc/**"
       - "pkg/agent/core/ngt/**"
       - "cmd/agent/core/ngt/**"
+      - "dockers/agent/core/ngt/Dockerfile"
       - "versions/GO_VERSION"
       - "versions/NGT_VERSION"
 

diff --git a/dockers/agent/core/ngt/Dockerfile b/dockers/agent/core/ngt/Dockerfile
@@ -22,7 +22,7 @@ ARG MAINTAINER="vdaas.org vald team <[email protected]>"
 
 FROM golang:${GO_VERSION} AS golang
 
-FROM ubuntu:devel AS builder
+FROM ubuntu:hirsute AS builder
 
 ARG UPX_OPTIONS
 

diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile
@@ -19,9 +19,9 @@ ARG MAINTAINER="vdaas.org vald team <[email protected]>"
 
 FROM golang:${GO_VERSION} AS golang
 
-FROM ubuntu:devel AS builder
+FROM ubuntu:hirsute AS builder
 ARG PROTOBUF_VERSION=3.14.0
-ARG GOLANGCI_LINT_VERSION=v1.36.0
+ARG GOLANGCI_LINT_VERSION=v1.42.1
 ARG REVIEWDOG_VERSION=v0.11.0
 
 LABEL maintainer "${MAINTAINER}"

diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile
@@ -16,9 +16,9 @@
 
 ARG MAINTAINER="vdaas.org vald team <[email protected]>"
 
-FROM ubuntu:devel AS builder
+FROM ubuntu:hirsute AS builder
 ARG PROTOBUF_VERSION=3.14.0
-ARG GOLANGCI_LINT_VERSION=v1.36.0
+ARG GOLANGCI_LINT_VERSION=v1.42.1
 ARG REVIEWDOG_VERSION=v0.11.0
 ARG YQ_VERSION=4.5.0