beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #44345 from thaJeztah/22.06_backport_go1.18_compat

Browse source 
[22.06 backport] builder/remotecontext/git: allow building on go1.18
This commit is contained in:
Sebastiaan van Stijn 2022-10-21 19:39:10 +02:00 committed by GitHub
commit 5aac513617
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builder/remotecontext/git/gitutils.go
View file

@ -213,7 +213,7 @@ func (repo gitRepo) gitWithinDir(dir string, args ...string) ([]byte, error) {
cmd := exec.Command("git", args...)
cmd.Dir = dir
// Disable unsafe remote protocols.
cmd.Env = append(cmd.Environ(), "GIT_PROTOCOL_FROM_USER=0")
cmd.Env = append(os.Environ(), "GIT_PROTOCOL_FROM_USER=0")
if repo.isolateConfig {
cmd.Env = append(cmd.Env,