Merge pull request #6190 from thaJeztah/fork_remotecontext

add local fork of github.com/docker/docker/builder/remotecontext

(cherry picked from commit 8c317ad)
Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

Dockerfile

@@ -31,7 +31,7 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS build-base-alpine
 ENV GOTOOLCHAIN=local
 COPY --link --from=xx / /
-RUN apk add --no-cache bash clang lld llvm file git
+RUN apk add --no-cache bash clang lld llvm file git git-daemon
 WORKDIR /go/src/github.com/docker/cli
 
 FROM build-base-alpine AS build-alpine

cli/command/image/build/context.go

@@ -16,7 +16,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/builder/remotecontext/git"
+	"github.com/docker/cli/cli/command/image/build/internal/git"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/go-archive"

cli/command/image/build/context_detect.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/docker/docker/builder/remotecontext/urlutil"
+	"github.com/docker/cli/cli/command/image/build/internal/urlutil"
 )
 
 // ContextType describes the type (source) of build-context specified.

…er/builder/remotecontext/git/gitutils.go …and/image/build/internal/git/gitutils.govendor/github.com/docker/docker/builder/remotecontext/git/gitutils.go renamed to cli/command/image/build/internal/git/gitutils.go vendor/github.com/docker/docker/builder/remotecontext/git/gitutils.go renamed to cli/command/image/build/internal/git/gitutils.go

@@ -148,6 +148,9 @@ func supportsShallowClone(remoteURL string) bool {
 
 		// Try a HEAD request and fallback to a Get request on error
 		res, err := http.Head(serviceURL) // #nosec G107
+		if err == nil {
+			_ = res.Body.Close()
+		}
 		if err != nil || res.StatusCode != http.StatusOK {
 			res, err = http.Get(serviceURL) // #nosec G107
 			if err == nil {