Merge pull request #48060 from thaJeztah/27.0_backport_api_deprecate_ContainerJSONBase_Node
[27.0 backport] api/types: deprecate ContainerJSONBase.Node, ContainerNode
diff --git a/Dockerfile b/Dockerfile
index 38a09e3..be2d1e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -229,7 +229,7 @@
FROM containerd-${TARGETOS} AS containerd
FROM base AS golangci_lint
-ARG GOLANGCI_LINT_VERSION=v1.55.2
+ARG GOLANGCI_LINT_VERSION=v1.59.1
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
GOBIN=/build/ GO111MODULE=on go install "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}" \
diff --git a/builder/remotecontext/remote.go b/builder/remotecontext/remote.go
index 6bac5d1..a8aeb2d 100644
--- a/builder/remotecontext/remote.go
+++ b/builder/remotecontext/remote.go
@@ -44,8 +44,8 @@
// GetWithStatusError does an http.Get() and returns an error if the
// status code is 4xx or 5xx.
func GetWithStatusError(address string) (resp *http.Response, err error) {
- // #nosec G107
- if resp, err = http.Get(address); err != nil {
+ resp, err = http.Get(address) // #nosec G107 -- ignore G107: Potential HTTP request made with variable url
+ if err != nil {
if uerr, ok := err.(*url.Error); ok {
if derr, ok := uerr.Err.(*net.DNSError); ok && !derr.IsTimeout {
return nil, errdefs.NotFound(err)
diff --git a/pkg/archive/archive_linux.go b/pkg/archive/archive_linux.go
index a40278b..93a615c 100644
--- a/pkg/archive/archive_linux.go
+++ b/pkg/archive/archive_linux.go
@@ -54,7 +54,7 @@
wo = &tar.Header{
Typeflag: tar.TypeReg,
Mode: hdr.Mode & int64(os.ModePerm),
- Name: filepath.Join(hdr.Name, WhiteoutOpaqueDir),
+ Name: filepath.Join(hdr.Name, WhiteoutOpaqueDir), // #nosec G305 -- An archive is being created, not extracted.
Size: 0,
Uid: hdr.Uid,
Uname: hdr.Uname,
@@ -62,7 +62,7 @@
Gname: hdr.Gname,
AccessTime: hdr.AccessTime,
ChangeTime: hdr.ChangeTime,
- } // #nosec G305 -- An archive is being created, not extracted.
+ }
}
}
