Merge branch 'main' into bugfix/crane_flatten_timestamp

Author: Stephanie0829

cmd/gcrane/Dockerfile

@@ -0,0 +1,3 @@
+FROM gcr.io/distroless/static-debian12:nonroot
+COPY gcrane /usr/local/bin/gcrane
+ENTRYPOINT ["/usr/local/bin/gcrane"]

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,

pkg/v1/remote/options.go

@@ -162,8 +162,14 @@ func makeOptions(opts ...Option) (*options, error) {
 			o.transport = transport.NewLogger(o.transport)
 		}
 
+		// Using customized retry predicate if provided, and fallback to default if not.
+		predicate := o.retryPredicate
+		if predicate == nil {
+			predicate = defaultRetryPredicate
+		}
+
 		// Wrap the transport in something that can retry network flakes.
-		o.transport = transport.NewRetry(o.transport, transport.WithRetryPredicate(defaultRetryPredicate), transport.WithRetryStatusCodes(o.retryStatusCodes...))
+		o.transport = transport.NewRetry(o.transport, transport.WithRetryPredicate(predicate), transport.WithRetryStatusCodes(o.retryStatusCodes...))
 
 		// Wrap this last to prevent transport.New from double-wrapping.
 		if o.userAgent != "" {

pkg/v1/remote/transport/error.go

@@ -25,7 +25,7 @@ import (
 )
 
 // Error implements error to support the following error specification:
-// https://github.com/docker/distribution/blob/master/docs/spec/api.md#errors
+// https://github.com/distribution/distribution/blob/aac2f6c8b7c5a6c60190848bab5cbeed2b5ba0a9/docs/spec/api.md#errors
 type Error struct {
 	Errors []Diagnostic `json:"errors,omitempty"`
 	// The http status code returned.
@@ -111,7 +111,7 @@ func (d Diagnostic) String() string {
 type ErrorCode string
 
 // The set of error conditions a registry may return:
-// https://github.com/docker/distribution/blob/master/docs/spec/api.md#errors-2
+// https://github.com/distribution/distribution/blob/aac2f6c8b7c5a6c60190848bab5cbeed2b5ba0a9/docs/spec/api.md#errors-2
 const (
 	BlobUnknownErrorCode         ErrorCode = "BLOB_UNKNOWN"
 	BlobUploadInvalidErrorCode   ErrorCode = "BLOB_UPLOAD_INVALID"
@@ -170,7 +170,7 @@ func CheckError(resp *http.Response, codes ...int) error {
 }
 
 func makeError(resp *http.Response, body []byte) *Error {
-	// https://github.com/docker/distribution/blob/master/docs/spec/api.md#errors
+	// https://github.com/distribution/distribution/blob/aac2f6c8b7c5a6c60190848bab5cbeed2b5ba0a9/docs/spec/api.md#errors
 	structuredError := &Error{}
 
 	// This can fail if e.g. the response body is not valid JSON. That's fine,