Merge branch 'main' into main

Author: Subserial

hack/presubmit.sh

@@ -20,20 +20,9 @@ set -o pipefail
 
 PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
-# We can't install in the current directory without changing the current module.
-TMP_DIR="$(mktemp -d)"
-export PATH="${PATH}:${TMP_DIR}/bin"
-export GOPATH="${TMP_DIR}"
-pushd ${TMP_DIR}
-trap popd EXIT
-go install honnef.co/go/tools/cmd/staticcheck@latest
-popd
-
 pushd ${PROJECT_ROOT}
 trap popd EXIT
 
-staticcheck ./pkg/...
-
 # Verify that all source files are correctly formatted.
 find . -name "*.go" | grep -v vendor/ | xargs gofmt -d -e -l
 

pkg/v1/daemon/image.go

@@ -312,7 +312,7 @@ func (i *image) computeImageConfig(config *specs.DockerOCIImageConfig) v1.Config
 		User:       config.User,
 		Volumes:    config.Volumes,
 		WorkingDir: config.WorkingDir,
-		//lint:ignore SA1019 this is erroneously deprecated, as windows uses it
+		//nolint:staticcheck // SA1019 this is erroneously deprecated, as windows uses it
 		ArgsEscaped: config.ArgsEscaped,
 		StopSignal:  config.StopSignal,
 		Shell:       config.Shell,